diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..37d956fd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.po    diff=po
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9cf844dd..93154afe 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,6 +5,7 @@
     "options": {
         "env": {
             "RUST_BACKTRACE": "1",
+            "RUST_LOG": "info",
             //"https_proxy": "localhost:8080"
         }
     },
diff --git a/AUTHORS b/AUTHORS
index c394002a..37352c69 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,11 @@
 Alexandre Trendel
+Noëlle
+Armin Begert
 Douile
+Diego Augusto
+TotalDarkness-NRF
+Seioo Inoue
+xRMG412
 realJavabot
 Gabriele Musco
 Alistair Francis
@@ -8,9 +14,4 @@ Nils Tonnätt
 Niklas Sauter
 Nicolas Fella
 Fridolin Weisser
-TotalDarkness-NRF
-Diego Augusto
-sei0o inoue
-Jan Przebor
-Noëlle
-xRMG412
\ No newline at end of file
+Jan Przebor
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 94fdceb5..0e839cbd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,7 +362,7 @@ checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
@@ -398,6 +398,15 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -556,6 +565,16 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "ctr"
 version = "0.6.0"
@@ -692,6 +711,18 @@ name = "env_logger"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "termcolor",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
  "atty",
  "humantime",
@@ -755,9 +786,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
+checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -770,9 +801,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
+checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -780,15 +811,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
+checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
+checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -797,9 +828,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
+checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
 
 [[package]]
 name = "futures-lite"
@@ -818,12 +849,10 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
+checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
 dependencies = [
- "autocfg",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn",
@@ -831,23 +860,22 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
+checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
 
 [[package]]
 name = "futures-task"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
+checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
 
 [[package]]
 name = "futures-util"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
+checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
 dependencies = [
- "autocfg",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -857,8 +885,6 @@ dependencies = [
  "memchr",
  "pin-project-lite 0.2.4",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -884,14 +910,14 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
 name = "gdk4"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce41092cc569129a0afa34926e6dd1cf8411e25652d87febdea36859f7ff7ba"
+checksum = "f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -905,9 +931,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-sys"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce39c71861b5bcde319fd4711a74e1bd6f4f474911170d51096597fef0b56011"
+checksum = "9498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -917,7 +943,7 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -1007,7 +1033,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
  "winapi",
 ]
 
@@ -1052,7 +1078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
 dependencies = [
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
@@ -1082,7 +1108,7 @@ checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
@@ -1105,14 +1131,14 @@ dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
 name = "gsk4"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64932b730eaad3340378a03d633616eeed6d6705b59b81c9f579c88be8932475"
+checksum = "eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1126,9 +1152,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685ffc776bedd91d68f47b41239525778b669432889721d7050d045270549b9a"
+checksum = "13aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -1137,14 +1163,14 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
 name = "gtk4"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49e0311dac847a8ebc05e31f5c44c596314ee3b16c5f638ccfe24086d24bf1b"
+checksum = "58a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1165,9 +1191,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe4b77996bcf1ef20208c00043edda854ca2091b4be5e6a7c367f0f3846fa67"
+checksum = "5068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1"
 dependencies = [
  "anyhow",
  "heck",
@@ -1181,9 +1207,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4-sys"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3737e91619cf4257d8a07834f7a2c035d4daeaf9ad8e3958e56b2c411dbdca18"
+checksum = "e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1195,7 +1221,7 @@ dependencies = [
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -1543,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita"
-version = "0.1.0-alpha-2"
+version = "0.1.0-beta-1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d117dc3147a6e5917a4652f638cfcb512edf5d29de2af6a8e30e0d5de4f7395b"
+checksum = "cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
@@ -1554,24 +1580,23 @@ dependencies = [
  "gtk4",
  "libadwaita-sys",
  "libc",
+ "once_cell",
  "pango",
 ]
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0-alpha-2"
+version = "0.1.0-beta-1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f1631562bdc3061b757290f17ea23237d59354ff6907069f40e1366fdb1426"
+checksum = "7a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c"
 dependencies = [
- "gdk-pixbuf-sys",
  "gdk4-sys",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "gtk4-sys",
  "libc",
- "pango-sys",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
@@ -1590,6 +1615,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
+
 [[package]]
 name = "libmdns"
 version = "0.6.1"
@@ -1668,12 +1699,12 @@ dependencies = [
 
 [[package]]
 name = "librespot"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450aa724dcc28a06c6f3a070e7f4b84c0800d9152bec3b012a11ff886986bd58"
+checksum = "5fb49bc466977d940fae6e9219d56e1355a2f3d77a348fe7f708fa8f36905491"
 dependencies = [
  "base64",
- "env_logger",
+ "env_logger 0.8.4",
  "futures-util",
  "getopts",
  "hex",
@@ -1681,6 +1712,7 @@ dependencies = [
  "librespot-audio",
  "librespot-connect",
  "librespot-core",
+ "librespot-discovery",
  "librespot-metadata",
  "librespot-playback",
  "librespot-protocol",
@@ -1694,39 +1726,30 @@ dependencies = [
 
 [[package]]
 name = "librespot-audio"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0e89d3e106d80600537eba02c17ea6dd8b3de3f46c99952b813b6f6d6445c0"
+checksum = "e5f7cc7e4d1c2596191be523668c933e07ec8a318d099fd66658258a4fe4a2dc"
 dependencies = [
  "aes-ctr",
  "byteorder",
  "bytes 1.0.1",
- "cfg-if 1.0.0",
  "futures-util",
- "lewton",
  "librespot-core",
  "log",
- "ogg",
  "tempfile",
  "tokio",
- "zerocopy",
 ]
 
 [[package]]
 name = "librespot-connect"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69425fd6c8d74779f1ec86b16e6b3114df50c8a0d94db5a5601ef634bfb5e288"
+checksum = "1e9dbfd8ee475a0874dc284f29c60d214bee43504979b244dd33763979f5ba76"
 dependencies = [
- "aes-ctr",
- "base64",
  "form_urlencoded",
- "futures-core",
  "futures-util",
- "hmac 0.11.0",
- "hyper",
- "libmdns",
  "librespot-core",
+ "librespot-discovery",
  "librespot-playback",
  "librespot-protocol",
  "log",
@@ -1734,17 +1757,15 @@ dependencies = [
  "rand 0.8.4",
  "serde",
  "serde_json",
- "sha-1",
  "tokio",
  "tokio-stream",
- "url",
 ]
 
 [[package]]
 name = "librespot-core"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3e70dce131f5531c982ca133f04fd1d1dd4208de27291dcd9ab6841c963248"
+checksum = "255e8d8d719c020895079d140baf0b0edec8447d39a7e4760708f33b7cafaafb"
 dependencies = [
  "aes",
  "base64",
@@ -1781,11 +1802,34 @@ dependencies = [
  "vergen",
 ]
 
+[[package]]
+name = "librespot-discovery"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4adeff34212261a291f6519331f9232699a3b0208116f48cb47a97224ff5b63"
+dependencies = [
+ "aes-ctr",
+ "base64",
+ "cfg-if 1.0.0",
+ "form_urlencoded",
+ "futures-core",
+ "hmac 0.11.0",
+ "hyper",
+ "libmdns",
+ "librespot-core",
+ "log",
+ "rand 0.8.4",
+ "serde_json",
+ "sha-1",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "librespot-metadata"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84157ce5d901dbdcaef17ed305deba5d87171725347673a1b632a334d910af47"
+checksum = "624ac29bb3ad2e565ef78a049a6c554d94e48b673aaba0bf7e7efd946d0b66cd"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -1797,21 +1841,25 @@ dependencies = [
 
 [[package]]
 name = "librespot-playback"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ca3df986a7e1a43008717660803e159177e86a589d484a0fc01fccd7967ad6"
+checksum = "188b252b690ae7387f84a481ff4211df1a5c21eb9bddfc25cbde48793f2e0ef2"
 dependencies = [
  "alsa",
  "byteorder",
  "cpal",
  "futures-executor",
  "futures-util",
+ "lewton",
  "libpulse-binding",
  "libpulse-simple-binding",
  "librespot-audio",
  "librespot-core",
  "librespot-metadata",
  "log",
+ "ogg",
+ "rand 0.8.4",
+ "rand_distr",
  "rodio",
  "shell-words",
  "thiserror",
@@ -1821,13 +1869,12 @@ dependencies = [
 
 [[package]]
 name = "librespot-protocol"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c753be4c3bd0f02b30c00d5d8547f16d557654cb737e70505aec6aa9990435d"
+checksum = "41b3699b05cb4c50caa5a5b7f5b3aadb928dfcc91cf1aa632c0dabce3ccc3ee4"
 dependencies = [
  "glob",
  "protobuf",
- "protobuf-codegen",
  "protobuf-codegen-pure",
 ]
 
@@ -1867,11 +1914,12 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "value-bag",
 ]
 
 [[package]]
@@ -2164,6 +2212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -2312,7 +2361,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.1.1",
 ]
 
 [[package]]
@@ -2513,18 +2562,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.24"
@@ -2536,24 +2573,24 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.14.0"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485"
+checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"
 
 [[package]]
 name = "protobuf-codegen"
-version = "2.14.0"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c"
+checksum = "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853"
 dependencies = [
  "protobuf",
 ]
 
 [[package]]
 name = "protobuf-codegen-pure"
-version = "2.14.0"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440"
+checksum = "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7"
 dependencies = [
  "protobuf",
  "protobuf-codegen",
@@ -2631,6 +2668,16 @@ dependencies = [
  "getrandom 0.2.1",
 ]
 
+[[package]]
+name = "rand_distr"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
+dependencies = [
+ "num-traits",
+ "rand 0.8.4",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -2698,9 +2745,9 @@ dependencies = [
 
 [[package]]
 name = "rodio"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
+checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
 dependencies = [
  "cpal",
 ]
@@ -2827,9 +2874,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.68"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
 dependencies = [
  "itoa",
  "ryu",
@@ -2975,10 +3022,10 @@ dependencies = [
 
 [[package]]
 name = "spot"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "async-std",
- "env_logger",
+ "env_logger 0.9.0",
  "form_urlencoded",
  "futures",
  "gdk-pixbuf",
@@ -3078,7 +3125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70"
 dependencies = [
  "anyhow",
- "cfg-expr",
+ "cfg-expr 0.7.4",
  "heck",
  "itertools",
  "pkg-config",
@@ -3089,6 +3136,19 @@ dependencies = [
  "version-compare",
 ]
 
+[[package]]
+name = "system-deps"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
+dependencies = [
+ "cfg-expr 0.9.0",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.1.0"
@@ -3114,18 +3174,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3345,6 +3405,16 @@ dependencies = [
  "getrandom 0.2.1",
 ]
 
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f"
+dependencies = [
+ "ctor",
+ "version_check",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.8"
@@ -3638,9 +3708,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a9373dead84d640ccf5798f2928917e6aa1ab3f130751406bb13e0a9dd9913"
+checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
 dependencies = [
  "byteorder",
  "enumflags2",
@@ -3652,9 +3722,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46ee71e0e88747ec582d290dbe98ff7907ff28770c7a35f16da41e5e6f1f4fa3"
+checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 44fad95c..4091a5ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "spot"
-version = "0.2.2"
+version = "0.3.0"
 edition = "2018"
 license = "MIT"
 
 [dependencies.gtk]
-version = "^0.2.0"
+version = "^0.3.0"
 package = "gtk4"
 
 [dependencies.gdk]
-version = "^0.2.0"
+version = "^0.3.0"
 package = "gdk4"
 
 [dependencies.gio]
@@ -21,11 +21,11 @@ version = "^0.14.8"
 features = ["v2_60"]
 
 [dependencies.librespot]
-version = "0.2.0"
+version = "0.3.1"
 features = ["alsa-backend", "pulseaudio-backend"]
 
 [dependencies.protobuf]
-version = "2.8.1"
+version = "2.25.2"
 
 [dependencies.tokio]
 version = "1"
@@ -34,14 +34,14 @@ features = ["rt", "macros", "sync"]
 
 [dependencies.futures]
 package = "futures"
-version = "0.3.17"
+version = "0.3.18"
 
 [dependencies.serde]
 version = "^1.0.130"
 features = ["derive"]
 
 [dependencies.serde_json]
-version = "^1.0.68"
+version = "^1.0.72"
 
 [dependencies.isahc]
 version = "^1.2.0"
@@ -58,15 +58,15 @@ features = ["gettext-system"]
 [dependencies]
 secret-service = "^2.0.1"
 gdk-pixbuf = "^0.14.0"
-libadwaita = "0.1.0-alpha-2"
+libadwaita = "^0.1.0-alpha-4"
 ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
 async-std = "^1.10.0"
 form_urlencoded = "^1.0.1"
 zbus = "^2.0.0-beta.3"
-zvariant = "^2.9.0"
+zvariant = "^2.10.0"
 zvariant_derive = "^2.5.0"
-thiserror = "^1.0.29"
+thiserror = "^1.0.30"
 lazy_static = "^1.4.0"
-log = "0.4.0"
-env_logger = "0.8.4"
+log = "0.4.14"
+env_logger = "0.9.0"
diff --git a/README.md b/README.md
index 1b3594a1..d03fd8d6 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,11 @@ Bear special attention to the fact that to enable automatic login, you might hav
 
 See [this comment](https://github.com/xou816/spot/issues/92#issuecomment-801852593) for more details!
 
+### Login in with Facebook
+
+...is not supported. However, you can update your account in order to be able to log in with a username and password [as explained in this issue](https://github.com/xou816/spot/issues/373).
+
+
 ### Settings
 
 Spot can also be configured via `gsettings` if you want to change the audio backend, the song bitrate, etc. [A GUI is planned but not available yet.](https://github.com/xou816/spot/issues/142)
@@ -47,9 +52,9 @@ Similarly, Spot does not display lyrics for songs, but you can use [osdlyrics](h
 
 Spot uses the dark theme variant by default; this can be changed using `gsettings`.
 
-If you are using the flatpak version, don't forget to install your theme with flatpak as well -- even for Adwaita-dark!
+If you are using the flatpak version, don't forget to install your theme with flatpak as well. See [this comment](https://github.com/xou816/spot/issues/209#issuecomment-860180537) for details.
 
-See [this comment](https://github.com/xou816/spot/issues/209#issuecomment-860180537) for details.
+Similarly, snap also requires that you install the corresponding snap for your theme. See [this comment](https://github.com/xou816/spot/issues/338#issuecomment-975543476) for details.
 
 ## Features
 
@@ -119,9 +124,9 @@ ninja spot-pot -C target
 ninja spot-update-po -C target
 ```
 
-### Pulling updates strings from POEditor
+### Pulling updated strings from POEditor
 
-We are now using POEditior and the wonderful [`poeditor-sync`](https://github.com/mick88/poeditor-sync) tool.
+We are now using POEditor and the wonderful [`poeditor-sync`](https://github.com/mick88/poeditor-sync) tool.
 
 ```
 poeditor pull
diff --git a/TRANSLATORS b/TRANSLATORS
index 3a9f64df..70d94a54 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -16,3 +16,8 @@ Guilherme
 Lars Martinsen
 Sergio
 SoftInterlingua
+Tine Jozelj
+Ana Pika Šubic
+Amor Ali
+Seioo Inoue
+Dmitry
\ No newline at end of file
diff --git a/cargo-sources.json b/cargo-sources.json
index 721e2f1f..785c60d5 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -519,6 +519,19 @@
         "dest": "cargo/vendor/cfg-expr-0.7.4",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.9.0.crate",
+        "sha256": "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571",
+        "dest": "cargo/vendor",
+        "dest-filename": "cfg-expr-0.9.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cfg-expr-0.9.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate",
@@ -727,6 +740,19 @@
         "dest": "cargo/vendor/crypto-mac-0.11.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ctor/ctor-0.1.19.crate",
+        "sha256": "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19",
+        "dest": "cargo/vendor",
+        "dest-filename": "ctor-0.1.19.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ctor-0.1.19",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ctr/ctr-0.6.0.crate",
@@ -896,6 +922,19 @@
         "dest": "cargo/vendor/env_logger-0.8.4",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/env_logger/env_logger-0.9.0.crate",
+        "sha256": "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3",
+        "dest": "cargo/vendor",
+        "dest-filename": "env_logger-0.9.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%220b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/env_logger-0.9.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/event-listener/event-listener-2.5.1.crate",
@@ -976,67 +1015,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures/futures-0.3.17.crate",
-        "sha256": "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca",
+        "url": "https://static.crates.io/crates/futures/futures-0.3.18.crate",
+        "sha256": "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-0.3.17.crate"
+        "dest-filename": "futures-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%228cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.17.crate",
-        "sha256": "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888",
+        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.18.crate",
+        "sha256": "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-channel-0.3.17.crate"
+        "dest-filename": "futures-channel-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-channel-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%227fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-channel-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.17.crate",
-        "sha256": "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d",
+        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.18.crate",
+        "sha256": "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-core-0.3.17.crate"
+        "dest-filename": "futures-core-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2288d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-core-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%22629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-core-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.17.crate",
-        "sha256": "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c",
+        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.18.crate",
+        "sha256": "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-executor-0.3.17.crate"
+        "dest-filename": "futures-executor-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2245025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-executor-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%227b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-executor-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.17.crate",
-        "sha256": "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377",
+        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.18.crate",
+        "sha256": "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-io-0.3.17.crate"
+        "dest-filename": "futures-io-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-io-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%22e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-io-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1054,54 +1093,54 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.17.crate",
-        "sha256": "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb",
+        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.18.crate",
+        "sha256": "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-macro-0.3.17.crate"
+        "dest-filename": "futures-macro-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2218e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-macro-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%22a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-macro-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.17.crate",
-        "sha256": "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11",
+        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.18.crate",
+        "sha256": "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-sink-0.3.17.crate"
+        "dest-filename": "futures-sink-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2236ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-sink-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%22996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-sink-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.17.crate",
-        "sha256": "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99",
+        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.18.crate",
+        "sha256": "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-task-0.3.17.crate"
+        "dest-filename": "futures-task-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-task-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%22dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-task-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.17.crate",
-        "sha256": "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481",
+        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.18.crate",
+        "sha256": "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-util-0.3.17.crate"
+        "dest-filename": "futures-util-0.3.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2236568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-util-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%2241d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-util-0.3.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1132,28 +1171,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk4/gdk4-0.2.0.crate",
-        "sha256": "8ce41092cc569129a0afa34926e6dd1cf8411e25652d87febdea36859f7ff7ba",
+        "url": "https://static.crates.io/crates/gdk4/gdk4-0.3.1.crate",
+        "sha256": "f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk4-0.2.0.crate"
+        "dest-filename": "gdk4-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228ce41092cc569129a0afa34926e6dd1cf8411e25652d87febdea36859f7ff7ba%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk4-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk4-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.2.0.crate",
-        "sha256": "ce39c71861b5bcde319fd4711a74e1bd6f4f474911170d51096597fef0b56011",
+        "url": "https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.3.1.crate",
+        "sha256": "9498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk4-sys-0.2.0.crate"
+        "dest-filename": "gdk4-sys-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ce39c71861b5bcde319fd4711a74e1bd6f4f474911170d51096597fef0b56011%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk4-sys-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%229498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk4-sys-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1366,67 +1405,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gsk4/gsk4-0.2.0.crate",
-        "sha256": "64932b730eaad3340378a03d633616eeed6d6705b59b81c9f579c88be8932475",
+        "url": "https://static.crates.io/crates/gsk4/gsk4-0.3.1.crate",
+        "sha256": "eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764",
         "dest": "cargo/vendor",
-        "dest-filename": "gsk4-0.2.0.crate"
+        "dest-filename": "gsk4-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2264932b730eaad3340378a03d633616eeed6d6705b59b81c9f579c88be8932475%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gsk4-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gsk4-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.2.0.crate",
-        "sha256": "685ffc776bedd91d68f47b41239525778b669432889721d7050d045270549b9a",
+        "url": "https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.3.1.crate",
+        "sha256": "13aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5",
         "dest": "cargo/vendor",
-        "dest-filename": "gsk4-sys-0.2.0.crate"
+        "dest-filename": "gsk4-sys-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22685ffc776bedd91d68f47b41239525778b669432889721d7050d045270549b9a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gsk4-sys-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%2213aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gsk4-sys-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4/gtk4-0.2.0.crate",
-        "sha256": "c49e0311dac847a8ebc05e31f5c44c596314ee3b16c5f638ccfe24086d24bf1b",
+        "url": "https://static.crates.io/crates/gtk4/gtk4-0.3.1.crate",
+        "sha256": "58a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-0.2.0.crate"
+        "dest-filename": "gtk4-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c49e0311dac847a8ebc05e31f5c44c596314ee3b16c5f638ccfe24086d24bf1b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%2258a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.2.0.crate",
-        "sha256": "bbe4b77996bcf1ef20208c00043edda854ca2091b4be5e6a7c367f0f3846fa67",
+        "url": "https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.3.1.crate",
+        "sha256": "5068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-macros-0.2.0.crate"
+        "dest-filename": "gtk4-macros-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22bbe4b77996bcf1ef20208c00043edda854ca2091b4be5e6a7c367f0f3846fa67%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-macros-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%225068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-macros-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.2.0.crate",
-        "sha256": "3737e91619cf4257d8a07834f7a2c035d4daeaf9ad8e3958e56b2c411dbdca18",
+        "url": "https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.3.1.crate",
+        "sha256": "e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-sys-0.2.0.crate"
+        "dest-filename": "gtk4-sys-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223737e91619cf4257d8a07834f7a2c035d4daeaf9ad8e3958e56b2c411dbdca18%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-sys-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-sys-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1873,28 +1912,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libadwaita/libadwaita-0.1.0-alpha-2.crate",
-        "sha256": "d117dc3147a6e5917a4652f638cfcb512edf5d29de2af6a8e30e0d5de4f7395b",
+        "url": "https://static.crates.io/crates/libadwaita/libadwaita-0.1.0-beta-1.crate",
+        "sha256": "cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552",
         "dest": "cargo/vendor",
-        "dest-filename": "libadwaita-0.1.0-alpha-2.crate"
+        "dest-filename": "libadwaita-0.1.0-beta-1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d117dc3147a6e5917a4652f638cfcb512edf5d29de2af6a8e30e0d5de4f7395b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libadwaita-0.1.0-alpha-2",
+        "url": "data:%7B%22package%22%3A%20%22cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libadwaita-0.1.0-beta-1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.1.0-alpha-2.crate",
-        "sha256": "64f1631562bdc3061b757290f17ea23237d59354ff6907069f40e1366fdb1426",
+        "url": "https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.1.0-beta-1.crate",
+        "sha256": "7a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c",
         "dest": "cargo/vendor",
-        "dest-filename": "libadwaita-sys-0.1.0-alpha-2.crate"
+        "dest-filename": "libadwaita-sys-0.1.0-beta-1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2264f1631562bdc3061b757290f17ea23237d59354ff6907069f40e1366fdb1426%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libadwaita-sys-0.1.0-alpha-2",
+        "url": "data:%7B%22package%22%3A%20%227a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libadwaita-sys-0.1.0-beta-1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1923,6 +1962,19 @@
         "dest": "cargo/vendor/libloading-0.5.2",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/libm/libm-0.2.1.crate",
+        "sha256": "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a",
+        "dest": "cargo/vendor",
+        "dest-filename": "libm-0.2.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libm-0.2.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/libmdns/libmdns-0.6.1.crate",
@@ -2003,93 +2055,106 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot/librespot-0.2.0.crate",
-        "sha256": "450aa724dcc28a06c6f3a070e7f4b84c0800d9152bec3b012a11ff886986bd58",
+        "url": "https://static.crates.io/crates/librespot/librespot-0.3.1.crate",
+        "sha256": "5fb49bc466977d940fae6e9219d56e1355a2f3d77a348fe7f708fa8f36905491",
+        "dest": "cargo/vendor",
+        "dest-filename": "librespot-0.3.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%225fb49bc466977d940fae6e9219d56e1355a2f3d77a348fe7f708fa8f36905491%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-0.3.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/librespot-audio/librespot-audio-0.3.1.crate",
+        "sha256": "e5f7cc7e4d1c2596191be523668c933e07ec8a318d099fd66658258a4fe4a2dc",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-0.2.0.crate"
+        "dest-filename": "librespot-audio-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22450aa724dcc28a06c6f3a070e7f4b84c0800d9152bec3b012a11ff886986bd58%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22e5f7cc7e4d1c2596191be523668c933e07ec8a318d099fd66658258a4fe4a2dc%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-audio-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-audio/librespot-audio-0.2.0.crate",
-        "sha256": "fa0e89d3e106d80600537eba02c17ea6dd8b3de3f46c99952b813b6f6d6445c0",
+        "url": "https://static.crates.io/crates/librespot-connect/librespot-connect-0.3.1.crate",
+        "sha256": "1e9dbfd8ee475a0874dc284f29c60d214bee43504979b244dd33763979f5ba76",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-audio-0.2.0.crate"
+        "dest-filename": "librespot-connect-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fa0e89d3e106d80600537eba02c17ea6dd8b3de3f46c99952b813b6f6d6445c0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-audio-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%221e9dbfd8ee475a0874dc284f29c60d214bee43504979b244dd33763979f5ba76%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-connect-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-connect/librespot-connect-0.2.0.crate",
-        "sha256": "69425fd6c8d74779f1ec86b16e6b3114df50c8a0d94db5a5601ef634bfb5e288",
+        "url": "https://static.crates.io/crates/librespot-core/librespot-core-0.3.1.crate",
+        "sha256": "255e8d8d719c020895079d140baf0b0edec8447d39a7e4760708f33b7cafaafb",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-connect-0.2.0.crate"
+        "dest-filename": "librespot-core-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2269425fd6c8d74779f1ec86b16e6b3114df50c8a0d94db5a5601ef634bfb5e288%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-connect-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22255e8d8d719c020895079d140baf0b0edec8447d39a7e4760708f33b7cafaafb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-core-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-core/librespot-core-0.2.0.crate",
-        "sha256": "df3e70dce131f5531c982ca133f04fd1d1dd4208de27291dcd9ab6841c963248",
+        "url": "https://static.crates.io/crates/librespot-discovery/librespot-discovery-0.3.1.crate",
+        "sha256": "c4adeff34212261a291f6519331f9232699a3b0208116f48cb47a97224ff5b63",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-core-0.2.0.crate"
+        "dest-filename": "librespot-discovery-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22df3e70dce131f5531c982ca133f04fd1d1dd4208de27291dcd9ab6841c963248%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-core-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22c4adeff34212261a291f6519331f9232699a3b0208116f48cb47a97224ff5b63%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-discovery-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-metadata/librespot-metadata-0.2.0.crate",
-        "sha256": "84157ce5d901dbdcaef17ed305deba5d87171725347673a1b632a334d910af47",
+        "url": "https://static.crates.io/crates/librespot-metadata/librespot-metadata-0.3.1.crate",
+        "sha256": "624ac29bb3ad2e565ef78a049a6c554d94e48b673aaba0bf7e7efd946d0b66cd",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-metadata-0.2.0.crate"
+        "dest-filename": "librespot-metadata-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2284157ce5d901dbdcaef17ed305deba5d87171725347673a1b632a334d910af47%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-metadata-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22624ac29bb3ad2e565ef78a049a6c554d94e48b673aaba0bf7e7efd946d0b66cd%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-metadata-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-playback/librespot-playback-0.2.0.crate",
-        "sha256": "59ca3df986a7e1a43008717660803e159177e86a589d484a0fc01fccd7967ad6",
+        "url": "https://static.crates.io/crates/librespot-playback/librespot-playback-0.3.1.crate",
+        "sha256": "188b252b690ae7387f84a481ff4211df1a5c21eb9bddfc25cbde48793f2e0ef2",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-playback-0.2.0.crate"
+        "dest-filename": "librespot-playback-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2259ca3df986a7e1a43008717660803e159177e86a589d484a0fc01fccd7967ad6%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-playback-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22188b252b690ae7387f84a481ff4211df1a5c21eb9bddfc25cbde48793f2e0ef2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-playback-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/librespot-protocol/librespot-protocol-0.2.0.crate",
-        "sha256": "1c753be4c3bd0f02b30c00d5d8547f16d557654cb737e70505aec6aa9990435d",
+        "url": "https://static.crates.io/crates/librespot-protocol/librespot-protocol-0.3.1.crate",
+        "sha256": "41b3699b05cb4c50caa5a5b7f5b3aadb928dfcc91cf1aa632c0dabce3ccc3ee4",
         "dest": "cargo/vendor",
-        "dest-filename": "librespot-protocol-0.2.0.crate"
+        "dest-filename": "librespot-protocol-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221c753be4c3bd0f02b30c00d5d8547f16d557654cb737e70505aec6aa9990435d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/librespot-protocol-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%2241b3699b05cb4c50caa5a5b7f5b3aadb928dfcc91cf1aa632c0dabce3ccc3ee4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/librespot-protocol-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2133,15 +2198,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/log/log-0.4.11.crate",
-        "sha256": "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b",
+        "url": "https://static.crates.io/crates/log/log-0.4.14.crate",
+        "sha256": "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710",
         "dest": "cargo/vendor",
-        "dest-filename": "log-0.4.11.crate"
+        "dest-filename": "log-0.4.14.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/log-0.4.11",
+        "url": "data:%7B%22package%22%3A%20%2251b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/log-0.4.14",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3002,32 +3067,6 @@
         "dest": "cargo/vendor/proc-macro-error-attr-1.0.4",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate",
-        "sha256": "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5",
-        "dest": "cargo/vendor",
-        "dest-filename": "proc-macro-hack-0.5.19.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/proc-macro-hack-0.5.19",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/proc-macro-nested/proc-macro-nested-0.1.4.crate",
-        "sha256": "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694",
-        "dest": "cargo/vendor",
-        "dest-filename": "proc-macro-nested-0.1.4.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/proc-macro-nested-0.1.4",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.24.crate",
@@ -3043,41 +3082,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf/protobuf-2.14.0.crate",
-        "sha256": "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485",
+        "url": "https://static.crates.io/crates/protobuf/protobuf-2.25.2.crate",
+        "sha256": "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-2.14.0.crate"
+        "dest-filename": "protobuf-2.25.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-2.14.0",
+        "url": "data:%7B%22package%22%3A%20%2247c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-2.25.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.14.0.crate",
-        "sha256": "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c",
+        "url": "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.25.2.crate",
+        "sha256": "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-codegen-2.14.0.crate"
+        "dest-filename": "protobuf-codegen-2.25.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-codegen-2.14.0",
+        "url": "data:%7B%22package%22%3A%20%223df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-codegen-2.25.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.14.0.crate",
-        "sha256": "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440",
+        "url": "https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.25.2.crate",
+        "sha256": "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-codegen-pure-2.14.0.crate"
+        "dest-filename": "protobuf-codegen-pure-2.25.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-codegen-pure-2.14.0",
+        "url": "data:%7B%22package%22%3A%20%22394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-codegen-pure-2.25.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3171,6 +3210,19 @@
         "dest": "cargo/vendor/rand_core-0.6.1",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/rand_distr/rand_distr-0.4.2.crate",
+        "sha256": "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f",
+        "dest": "cargo/vendor",
+        "dest-filename": "rand_distr-0.4.2.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand_distr-0.4.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/rand_hc/rand_hc-0.2.0.crate",
@@ -3277,15 +3329,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rodio/rodio-0.13.1.crate",
-        "sha256": "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f",
+        "url": "https://static.crates.io/crates/rodio/rodio-0.14.0.crate",
+        "sha256": "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9",
         "dest": "cargo/vendor",
-        "dest-filename": "rodio-0.13.1.crate"
+        "dest-filename": "rodio-0.14.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rodio-0.13.1",
+        "url": "data:%7B%22package%22%3A%20%224d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rodio-0.14.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3459,15 +3511,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.68.crate",
-        "sha256": "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8",
+        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.72.crate",
+        "sha256": "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_json-1.0.68.crate"
+        "dest-filename": "serde_json-1.0.72.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_json-1.0.68",
+        "url": "data:%7B%22package%22%3A%20%22d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_json-1.0.72",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3782,6 +3834,19 @@
         "dest": "cargo/vendor/system-deps-3.1.1",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/system-deps/system-deps-5.0.0.crate",
+        "sha256": "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e",
+        "dest": "cargo/vendor",
+        "dest-filename": "system-deps-5.0.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2218db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/system-deps-5.0.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/tempfile/tempfile-3.1.0.crate",
@@ -3810,28 +3875,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/thiserror/thiserror-1.0.29.crate",
-        "sha256": "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88",
+        "url": "https://static.crates.io/crates/thiserror/thiserror-1.0.30.crate",
+        "sha256": "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417",
         "dest": "cargo/vendor",
-        "dest-filename": "thiserror-1.0.29.crate"
+        "dest-filename": "thiserror-1.0.30.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/thiserror-1.0.29",
+        "url": "data:%7B%22package%22%3A%20%22854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/thiserror-1.0.30",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.29.crate",
-        "sha256": "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c",
+        "url": "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.30.crate",
+        "sha256": "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b",
         "dest": "cargo/vendor",
-        "dest-filename": "thiserror-impl-1.0.29.crate"
+        "dest-filename": "thiserror-impl-1.0.30.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/thiserror-impl-1.0.29",
+        "url": "data:%7B%22package%22%3A%20%22aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/thiserror-impl-1.0.30",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4133,6 +4198,19 @@
         "dest": "cargo/vendor/uuid-0.8.2",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/value-bag/value-bag-1.0.0-alpha.8.crate",
+        "sha256": "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f",
+        "dest": "cargo/vendor",
+        "dest-filename": "value-bag-1.0.0-alpha.8.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2279923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/value-bag-1.0.0-alpha.8",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/vcpkg/vcpkg-0.2.8.crate",
@@ -4512,28 +4590,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zvariant/zvariant-2.9.0.crate",
-        "sha256": "e1a9373dead84d640ccf5798f2928917e6aa1ab3f130751406bb13e0a9dd9913",
+        "url": "https://static.crates.io/crates/zvariant/zvariant-2.10.0.crate",
+        "sha256": "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525",
         "dest": "cargo/vendor",
-        "dest-filename": "zvariant-2.9.0.crate"
+        "dest-filename": "zvariant-2.10.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e1a9373dead84d640ccf5798f2928917e6aa1ab3f130751406bb13e0a9dd9913%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zvariant-2.9.0",
+        "url": "data:%7B%22package%22%3A%20%22a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant-2.10.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-2.9.0.crate",
-        "sha256": "46ee71e0e88747ec582d290dbe98ff7907ff28770c7a35f16da41e5e6f1f4fa3",
+        "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-2.10.0.crate",
+        "sha256": "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9",
         "dest": "cargo/vendor",
-        "dest-filename": "zvariant_derive-2.9.0.crate"
+        "dest-filename": "zvariant_derive-2.10.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2246ee71e0e88747ec582d290dbe98ff7907ff28770c7a35f16da41e5e6f1f4fa3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zvariant_derive-2.9.0",
+        "url": "data:%7B%22package%22%3A%20%22e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant_derive-2.10.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
diff --git a/data/appstream/1.png b/data/appstream/1.png
index 5ca810e9..ea1f28ba 100644
Binary files a/data/appstream/1.png and b/data/appstream/1.png differ
diff --git a/data/appstream/2.png b/data/appstream/2.png
index fa4d58d1..808afdbb 100644
Binary files a/data/appstream/2.png and b/data/appstream/2.png differ
diff --git a/data/appstream/3.png b/data/appstream/3.png
index 1f9e8384..97db9a27 100644
Binary files a/data/appstream/3.png and b/data/appstream/3.png differ
diff --git a/data/dev.alextren.Spot.appdata.xml b/data/dev.alextren.Spot.appdata.xml
index 85197250..fc518eb1 100644
--- a/data/dev.alextren.Spot.appdata.xml
+++ b/data/dev.alextren.Spot.appdata.xml
@@ -23,7 +23,8 @@
   </custom>
   <description>
     <p>
-      Listen to music on Spotify. <b>Requires a premium account.</b>
+      Listen to music on Spotify.
+      <b>Requires a premium account.</b>
     </p>
     <p>Current features:</p>
     <ul>
@@ -50,6 +51,24 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.3.0" date="2022-01-13">
+      <description>
+        <p>
+          There has been no release for a while, but this one packs quite a few features:
+        </p>
+        <ul>
+          <li>redesigned several parts of the application: headers, selection tools, library, album view... (thanks @jannuary!)</li>
+          <li>many, many, many more subtle design changes and tweaks still owed to @jannuary</li>
+          <li>playlists are now accessible from the sidebar (thanks @abegert!)</li>
+          <li>the album art is visible for individual songs, and the release year is visible for albums (thanks @abegert and @sei0o!)</li>
+          <li>volume control over MPRIS (thanks @Diegovsky!)</li>
+          <li>as always, updated translations for yet more languages; thanks to the many people involved on POEditor!</li>
+        </ul>
+        <p>
+          Thank you so much to everyone involved for this release, including those I could not mention. If you're willing to contribute, do not hesitate to seek advice from those trusted contributors, and be sure to direct your UX questions towards @jannuary (as long as they're fine with it!).
+        </p>
+      </description>
+    </release>
     <release version="0.2.2" date="2021-11-10">
       <description>
         <p>Quick fix for a startup crash, sorry for the inconvenience. Thanks @xRMG412! </p>
@@ -279,4 +298,4 @@
       </description>
     </release>
   </releases>
-</component>
+</component>
\ No newline at end of file
diff --git a/dev.alextren.Spot.develoment.json b/dev.alextren.Spot.development.json
similarity index 50%
rename from dev.alextren.Spot.develoment.json
rename to dev.alextren.Spot.development.json
index d70d5a7c..8fa7e565 100644
--- a/dev.alextren.Spot.develoment.json
+++ b/dev.alextren.Spot.development.json
@@ -1,7 +1,7 @@
 {
     "app-id": "dev.alextren.Spot",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "40",
+    "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -37,45 +37,6 @@
         "*.a"
     ],
     "modules": [
-        {
-            "name": "libadwaita",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dexamples=false",
-                "-Dtests=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
-                    "branch": "1.0.0-alpha.2"
-                }
-            ],
-            "modules": [
-                {
-                    "name": "libsass",
-                    "buildsystem": "meson",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/lazka/libsass.git",
-                            "branch": "meson"
-                        }
-                    ]
-                },
-                {
-                    "name": "sassc",
-                    "buildsystem": "meson",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/lazka/sassc.git",
-                            "branch": "meson"
-                        }
-                    ]
-                }
-            ]
-        },
         {
             "name": "spot",
             "builddir": true,
diff --git a/dev.alextren.Spot.snapshots.json b/dev.alextren.Spot.snapshots.json
index 82451adc..61be3326 100644
--- a/dev.alextren.Spot.snapshots.json
+++ b/dev.alextren.Spot.snapshots.json
@@ -1,7 +1,7 @@
 {
     "app-id": "dev.alextren.Spot",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "40",
+    "runtime-version": "41",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -51,7 +51,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
-                    "branch": "1.0.0-alpha.2"
+                    "branch": "1.0.0.alpha.4"
                 }
             ],
             "modules": [
@@ -96,4 +96,4 @@
             ]
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 078e6393..ce8f2e0b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'spot',
-  version: '0.2.2',
+  version: '0.3.0',
   meson_version: '>= 0.50.0',
   default_options: ['warning_level=2', 'buildtype=release'],
 )
diff --git a/po/LINGUAS b/po/LINGUAS
index 92af2fae..489a6d29 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb
+en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar
diff --git a/po/POTFILES b/po/POTFILES
index 00577a99..a4204043 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -4,31 +4,33 @@ src/app/components/details/release_details.rs
 src/app/components/labels.rs
 src/app/components/login/login_model.rs
 src/app/components/mod.rs
+src/app/components/navigation/factory.rs
 src/app/components/navigation/home.rs
+src/app/components/now_playing/now_playing_model.rs
 src/app/components/playback/playback_controls.rs
 src/app/components/playback/playback_info.rs
-src/app/components/search/search.rs
-src/app/components/selection/selection_heading.rs
 src/app/components/user_menu/user_menu.rs
 src/app/state/login_state.rs
 src/main.rs
 
 # find src -name "*.ui*" -print
 src/window.ui.in
-src/app/components/details/release_details.ui
-src/app/components/details/details.ui
+src/app/components/saved_playlists/saved_playlists.ui
+src/app/components/artist_details/artist_details.ui
+src/app/components/saved_tracks/saved_tracks.ui
+src/app/components/search/search.ui
 src/app/components/artist/artist.ui
-src/app/components/playback/playback_controls.ui
-src/app/components/playback/playback_widget.ui
-src/app/components/playback/playback_info.ui
 src/app/components/user_details/user_details.ui
+src/app/components/selection/selection_toolbar.ui
+src/app/components/details/release_details.ui
+src/app/components/details/details.ui
+src/app/components/now_playing/now_playing.ui
+src/app/components/login/login.ui
 src/app/components/playlist_details/playlist_details.ui
+src/app/components/headerbar/headerbar.ui
 src/app/components/album/album.ui
-src/app/components/artist_details/artist_details.ui
-src/app/components/login/login.ui
-src/app/components/saved_playlists/saved_playlists.ui
-src/app/components/library/library.ui
-src/app/components/now_playing/now_playing.ui
 src/app/components/playlist/song.ui
-src/app/components/saved_tracks/saved_tracks.ui
-src/app/components/search/search.ui
+src/app/components/playback/playback_widget.ui
+src/app/components/playback/playback_info.ui
+src/app/components/playback/playback_controls.ui
+src/app/components/library/library.ui
\ No newline at end of file
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 00000000..b3307389
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,269 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/details/release_details.rs:89
+msgid "by"
+msgstr "بواسطة"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "شاهد ألبوم"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "نسخ الرابط"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+msgid "Add to queue"
+msgstr "أضف إلى الصف"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "أحدف من الصف"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "أضف إلى {}"
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr "لايمكن حفظ كلمة المرور. تحقق من أن ال Session Keyring مفتوح."
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "حدث خطأ. تحقق من الlog لمزيد التفاصيل!"
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+msgid "Library"
+msgstr "مكتبة"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+msgid "Playlists"
+msgstr "قائمة أغاني"
+
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+msgid "Now playing"
+msgstr "يشتغل الأن"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "لا توجد أغنية طور التشغيل"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+msgid "About"
+msgstr "عن"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+msgid "Quit"
+msgstr "غادر"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+msgid "Log out"
+msgstr "تسجيل الخروج"
+
+#: src/app/state/login_state.rs:117
+msgid "Connection restored"
+msgstr "إعادة الاتصال"
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "أفضل الأغاني"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+msgid "Releases"
+msgstr "أصدارات"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "قم بتسجيل الدخول إلى Spotify Premium"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "أسم المستخدم"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "كلمة السر"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "فشل عملىة التحقق!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "تسجيل دخول"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "ألبومات"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "الفنانين"
+
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "أغاني محفوظة"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock مفعل"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "أوقف"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "شغل"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "عشوائي"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "سابق"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "التالي"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "كرر"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "ليس لديك قوائم تشغيل محفوظة."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "قائمات التشغيل خاصتك ستظهر هنا."
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "ليس لديك ألبومات مسجلة."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "المكتبة خاصتك ستظهر هنا."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} تم تحديد صفر أغنية"
+msgstr[1] "{} تم تحديد أغنية واحدة"
+msgstr[2] "{} تم تحديد أغنيتان"
+msgstr[3] "{} تم تحديد بعض الأغاني"
+msgstr[4] "{} تم تحديد عديد الأغاني"
+msgstr[5] "{} الأغاني الأخرى المحددة"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "أبحث في Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "أكتب للبجث."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "أحدف"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "أضف إلى قائمة التشغيل..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "ألغاء"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "اختر الكل"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+#, fuzzy
+msgid "More from {}"
+msgstr "{} المزيد من"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "الناشر"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "أطلقت"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "الأغاني"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "المدة"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "حقوق النشر"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
diff --git a/po/ca.po b/po/ca.po
index 66dc80ee..d6b95680 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,101 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr ""
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr ""
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Llançaments"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "Millors pistes"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr ""
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr ""
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Ha ocorregut un error. Comprova els registres per més detalls!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Mostra l'àlbum"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Més de"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copia l'enllaç"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Afegeix a la cua"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Suprimeix de la cua"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
+msgstr "Afegeix a {}"
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} cançó seleccionada"
+msgstr[1] "{} cançons seleccionades"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Més de {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
 msgstr ""
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "No s'ha pogut desar la sessió. Assegura't que l'anell de claus de la sessió està desbloquejat."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Ha ocorregut un error. Comprova els registres per més detalls!"
+msgstr ""
+"No s'ha pogut desar la sessió. Assegura't que l'anell de claus de la sessió "
+"està desbloquejat."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Llistes de reproducció"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Pistes desades"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "S'està reproduïnt"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Reprodueix"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -103,23 +103,6 @@ msgstr "S'està reproduïnt"
 msgid "No song playing"
 msgstr "Cap cançó en reproducció"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Cerca resultats per"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Cap cançó seleccionada"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "cançó seleccionada"
-msgstr[1] "cançons seleccionades"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +122,81 @@ msgstr "Tanca la sessió"
 msgid "Connection restored"
 msgstr "Connexió restablerta"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "No teniu llistes de reproducció desades."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Les vostres llistes de reproducció es mostraran aquí."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Millors pistes"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Llançaments"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Àlbums"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistes"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Etiqueta"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+#, fuzzy
+msgid "Released"
+msgstr "Llançaments"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+#, fuzzy
+msgid "Tracks"
+msgstr "Millors pistes"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duració"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +212,56 @@ msgstr "Nom d'usuari"
 msgid "Password"
 msgstr "Contrasenya"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Bloq Maj està habilitat!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "L'autenticació ha fallat!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Inicia sessió"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Àlbums"
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistes"
-
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Barreja"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Anterior"
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Següent"
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Repeteix"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "No teniu àlbums desats."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Aquí es mostrarà la vostra biblioteca."
 
+#~ msgid "by"
+#~ msgstr "per"
diff --git a/po/cs.po b/po/cs.po
index f821b475..2ba4b3d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,88 +9,61 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
+#: src/app/components/details/release_details.rs:89
 msgid "by"
 msgstr "od"
 
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Vydavatelství:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Vydáno:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Počet skladeb:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Délka:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Zobrazit album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Více od"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Zkopírovat odkaz"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Přidat do fronty"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Odebrat z fronty"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Přidat do {}"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Heslo nelze uložit. Zkontrolujte, že je klíčenka (session keyring) odemčená."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
 msgid "An error occured. Check logs for details!"
 msgstr "Došlo k chybě. Podrobnosti najdete v protokolu."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Knihovna"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Playlisty"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Právě hraje"
 
@@ -101,24 +74,6 @@ msgstr "Právě hraje"
 msgid "No song playing"
 msgstr "Nic nehraje"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Výsledky vyhledávání pro"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Nebyla vybrána žádná skladba"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "skladba vybrána"
-msgstr[1] "skladby vybrány"
-msgstr[2] "skladeb vybráno"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,12 +94,12 @@ msgid "Connection restored"
 msgstr "Připojení obnoveno"
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Populární"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Diskografie"
 
@@ -164,53 +119,150 @@ msgid "Password"
 msgstr "Heslo"
 
 #. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:95
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Chyba autentizace!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Přihlásit se"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
+#: src/app/components/search/search.ui:70
 msgid "Albums"
 msgstr "Alba"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
+#: src/app/components/search/search.ui:103
 msgid "Artists"
 msgstr "Umělci"
 
 #. Where is this text displayed?
 #. I see it is supposed to be in `src/app/components/navigation/home.rs:47`, but that does not seem to be the case: https://github.com/xou816/spot/blob/1b96cd07129f27c7f3f3a2e66299c44a52e489d4/src/app/components/navigation/home.rs
 #. Maybe it is something that has not been commited yet (2021-10-02T10:42:52+02:00), but @xou816 has it locally and has generated pot / po files from it in https://github.com/xou816/spot/commit/86414c03d207cdf4e2c1cbddd47c7ca5629d1303
-#: src/app/components/navigation/home.rs:47
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
 msgid "Saved tracks"
 msgstr "Uložené skladby"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr "Nemáte žádná uložená alba."
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Máte zapnutý Caps Lock!"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr "Tady bude zobrazena vaše knihovna."
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pozastavit"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Přehrát"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Náhodné přehrávání"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Předchozí"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Následující"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Opakovat"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
 msgstr "Nemáte žádné uložené playlisty."
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
 msgid "Your playlists will be shown here."
 msgstr "Tady budou zobrazeny vaše playlisty."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Nemáte žádná uložená alba."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Tady bude zobrazena vaše knihovna."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} skladba vybrána"
+msgstr[1] "{} skladby vybrány"
+msgstr[2] "{} skladeb vybráno"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Hledat na Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Zadejte a vyhledejte."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Odstranit"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Přidat do playlistu..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Vybrat vše"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Více od {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Vydavatelství"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Vydáno"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Počet skladeb"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Délka"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} od {}"
 
diff --git a/po/de.po b/po/de.po
index 8ece4d41..5fd4e719 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,88 +9,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
+#: src/app/components/details/release_details.rs:89
 msgid "by"
 msgstr "von"
 
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Label:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Veröffentlicht:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Titel:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Dauer:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Album ansehen"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Mehr von"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Link kopieren"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Zur Warteschlange hinzufügen"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Von Warteschlange entfernen"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Zu {} hinzufügen"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Das Passwort konnte nicht gespeichert werden. Stellen Sie sicher, dass der Sitzungs-Schlüsselbund entsperrt ist."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
 msgid "An error occured. Check logs for details!"
 msgstr "Es ist ein Fehler aufgetreten. Überprüfen Sie die Protokolle für Details!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Bibliothek"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Playlists"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Es läuft"
 
@@ -101,23 +74,6 @@ msgstr "Es läuft"
 msgid "No song playing"
 msgstr "Es wird kein Titel gespielt"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Suchergebnisse für"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Kein Titel ausgewählt"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "Titel ausgewählt"
-msgstr[1] "Titel ausgewählt"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -138,12 +94,12 @@ msgid "Connection restored"
 msgstr "Verbindung wiederhergestellt"
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Beliebte Titel"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Diskografie"
 
@@ -163,50 +119,146 @@ msgid "Password"
 msgstr "Passwort"
 
 #. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:95
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Anmeldung fehlgeschlagen!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Anmelden"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
+#: src/app/components/search/search.ui:70
 msgid "Albums"
 msgstr "Alben"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
+#: src/app/components/search/search.ui:103
 msgid "Artists"
 msgstr "Künstler"
 
-#: src/app/components/navigation/home.rs:47
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
 msgid "Saved tracks"
-msgstr ""
+msgstr "Gespeicherte Titel"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr ""
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Feststelltaste ist aktiviert!"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pause"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Play"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Zurück"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Weiter"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
-msgstr ""
+msgstr "Keine gespeicherten Playlists vorhanden."
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
 msgid "Your playlists will be shown here."
-msgstr ""
+msgstr "Playlists werden hier angezeigt."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Keine gespeicherten Alben vorhanden."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Die Bibliothek wird hier angezeigt."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} Titel ausgewählt"
+msgstr[1] "{} Titel ausgewählt"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Auf Spotify suchen."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Tippe um zu suchen."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Entfernen"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Zur Playlist hinzufügen..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Alle auswählen"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Mehr von {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Label"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Veröffentlicht"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Titel"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Dauer"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} von {}"
 
diff --git a/po/en.po b/po/en.po
index 5e11261f..281f6dac 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,99 +1,99 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "by"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Label:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Released:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Tracks:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duration:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "An error occured. Check logs for details!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "View album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "More from"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copy link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Add to queue"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Remove from queue"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Add to {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} song selected"
+msgstr[1] "{} songs selected"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "More from {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Could not save password. Make sure the session keyring is unlocked."
 
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "An error occured. Check logs for details!"
-
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Library"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Playlists"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr ""
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Now playing"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,23 +101,6 @@ msgstr "Now playing"
 msgid "No song playing"
 msgstr "No song playing"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Search results for"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "No song selected"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "song selected"
-msgstr[1] "songs selected"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -137,16 +120,79 @@ msgstr "Log out"
 msgid "Connection restored"
 msgstr "Connection restored"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Top tracks"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Releases"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albums"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artists"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Label"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Released"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Tracks"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duration"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -162,51 +208,56 @@ msgstr "Username"
 msgid "Password"
 msgstr "Password"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr ""
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Authentication failed!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Log in"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albums"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artists"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
 msgstr ""
 
-#: 
-msgid "Caps Lock is enabled!"
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
 msgstr ""
 
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/es.po b/po/es.po
index 0de9d724..8f8fa1c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,101 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "por"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Etiqueta:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Lanzado:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "Canciones:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duración:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Ha ocurrido un error. ¡Revisa los logs para más detalles!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Ver álbum"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Más de"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copiar enlace"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Añadir a la cola"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Borrar de la lista"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Añadir a {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} canción seleccionada"
+msgstr[1] "{} canciones seleccionadas"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Más de {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "No se pudo guardar la contraseña. Asegúrate de que el anillo de claves esta desbloqueado."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Ha ocurrido un error. ¡Revisa los logs para más detalles!"
+msgstr ""
+"No se pudo guardar la contraseña. Asegúrate de que el anillo de claves esta "
+"desbloqueado."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Lista de reproducción"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Pistas guardadas"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Reproduciendo ahora"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Reproducir"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -103,23 +103,6 @@ msgstr "Reproduciendo ahora"
 msgid "No song playing"
 msgstr "Ninguna canción en reproducción"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Buscar resultados para"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Ninguna canción seleccionada"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "canción seleccionada"
-msgstr[1] "canciones seleccionadas"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +122,79 @@ msgstr "Cerrar sesión"
 msgid "Connection restored"
 msgstr "Conexión restaurada"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "No tienes listas de reproducción guardadas."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Tus listas de reproducción se mostrarán aquí."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Mejores canciones"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Lanzamientos"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Álbumes"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistas"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Buscar en Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Escribe para buscar."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Añadir a la lista de reproducción..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Retirar"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Etiqueta"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Lanzado"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Canciones"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duración"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +210,56 @@ msgstr "Usuario"
 msgid "Password"
 msgstr "Contraseña"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "¡El bloqueo de mayúsculas está activado!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "¡Autenticación fallida!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Álbumes"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistas"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Seleccionar todo"
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Activar aleatorio"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Anterior"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Siguiente"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Activar repetir"
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "No tienes álbumes guardados."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Tu biblioteca se mostrará aquí."
 
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/eu.po b/po/eu.po
index b3dd4ff4..a2df0b81 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,99 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "by"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Etiketa:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Argitaratua:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Pistak:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Iraupena:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Egile-eskubideak:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Errore bat gertatu da. Egiaztatu xehetasunak erregistroetan!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Albuma ikusi"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Gehiago honi buruz"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Kopiatu esteka"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Gehitu isatsari"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Ezabatu isatsetik"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Gehitu {} (r)i"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} Aukeratutako abesti bat"
+msgstr[1] "{} Aukeratutako abestiak"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Gehiago honi buruz {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Ezin izan da pasahitza gorde. Ziurtatu saioko giltzatakoa desblokeatuta dagoela."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Errore bat gertatu da. Egiaztatu xehetasunak erregistroetan!"
+msgstr ""
+"Ezin izan da pasahitza gorde. Ziurtatu saioko giltzatakoa desblokeatuta "
+"dagoela."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Erreprodukzio-zerrendak"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Gordetako pistak"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Orain erreproduzitzen"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Gelditu"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Erreproduzitu"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,23 +103,6 @@ msgstr "Orain erreproduzitzen"
 msgid "No song playing"
 msgstr "Ez da abestirik erreproduzitzen ari"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Bilaketaren emaitzak"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Ez da abestirik aukeratu"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "Aukeratutako abesti bat"
-msgstr[1] "Aukeratutako abestiak"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -137,16 +122,79 @@ msgstr "Saioa itxi"
 msgid "Connection restored"
 msgstr "Konexioa leheneratu da"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Ez duzu erreprodukzio zerrendarik gordeta."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Zure erreprodukzio zerrendak hemen agertuko dira."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Pista nagusiak"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Jaurtiketak"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albumak"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistak"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Bilatu Spotifyn."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Idatzi bilatzeko."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Erreprodukzio-zerrendara gehitu..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Ezabatu"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Etiketa"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Argitaratua"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Pistak"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Iraupena"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Egile-eskubideak"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -162,51 +210,56 @@ msgstr "Erabiltzailearen izena"
 msgid "Password"
 msgstr "Pasahitza"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Letra larrien blokeoa aktibatuta dago!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Autentifikazioak huts egin du!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albumak"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Ezeztatu"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistak"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Hautatu dena"
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Nahasketa"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Aurrekoa"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Hurrengoa"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Errepikatu"
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Ez duzu albumik gordeta."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Zure liburutegia hemen agertuko da."
 
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/fi.po b/po/fi.po
index 9847a193..669456d6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,99 +1,100 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "esittäjä"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Levy-yhtiö:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Julkaistu:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Kappaleita:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Kesto:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Tekijänoikeus:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Tapahti virhe. Katso lisätiedot lokista!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Näytä albumi"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Lisää esittäjältä"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Kopioi linkki"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Lisää jonoon"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Poista jonosta"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Lisää kohteeseen {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} kappale valittu"
+msgstr[1] "{} kappaletta valittu"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Lisää esittäjältä {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Salasanaa ei voitu tallentaa. Varmista että avainnippua ei ole lukittu."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Tapahti virhe. Katso lisätiedot lokista!"
+msgstr ""
+"Salasanaa ei voitu tallentaa. Varmista että avainnippua ei ole lukittu."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Kirjasto"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Soittolistat"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Tallennetut kappaleet"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Nyt toistetaan"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Keskeytä"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Toista"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,23 +102,6 @@ msgstr "Nyt toistetaan"
 msgid "No song playing"
 msgstr "Ei toistettavaa kappaletta"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Tulokset haulle"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Ei kappaletta valittuna"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "kappale valittu"
-msgstr[1] "kappaletta valittu"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -137,16 +121,79 @@ msgstr "Kirjaudu ulos"
 msgid "Connection restored"
 msgstr "Yhteys palautunut"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Ei tallennettuja soittolistoja."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Soittolistasi näytetään täällä."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Suosituimmat kappaleet"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Julkaisut"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albumit"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Esittäjät"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Etsi Spotifysta."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Kirjoita etsiäksesi."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Lisää soittolistaan..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Poista"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Levy-yhtiö"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Julkaistu"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Kappaleita"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Kesto"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Tekijänoikeus"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -162,51 +209,56 @@ msgstr "Käyttäjätunnus"
 msgid "Password"
 msgstr "Salasana"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock on päällä!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Tunnistautuminen epäonnistui!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albumit"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Peru"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Esittäjät"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Valitse kaikki"
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Sekoita"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Edellinen"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Seuraava"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Kertaa"
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Ei tallennettuja albumeja."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Kirjastosi näytetään täällä."
 
+#~ msgid "by"
+#~ msgstr "esittäjä"
diff --git a/po/fr.po b/po/fr.po
index 446840ad..e451003c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,99 +1,103 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "par"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Label :"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Date de publication :"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Morceaux :"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Durée :"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright :"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr ""
+"Une erreur est survenue. Consultez les journaux de débogage pour plus "
+"d'information."
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Voir l'album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Plus de"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copier le lien"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Ajouter à la file d'attente"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Retirer de la file d'attente"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Ajouter à {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} morceau sélectionné"
+msgstr[1] "{} morceaux sélectionnés"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Plus de {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Le mot de passe n'a pu être enregistré, assurez-vous que le Trousseau de session est déverouillé."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Une erreur est survenue. Consultez les journaux de débogage pour plus d'information."
+msgstr ""
+"Le mot de passe n'a pu être enregistré, assurez-vous que le Trousseau de "
+"session est déverouillé."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Bibliothèque"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Titres aimés"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "En cours de lecture"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pause"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Lecture"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,23 +105,6 @@ msgstr "En cours de lecture"
 msgid "No song playing"
 msgstr "Aucune lecture en cours"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Résultats pour"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Aucun morceau sélectionné"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "morceau sélectionné"
-msgstr[1] "morceaux sélectionnés"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -137,16 +124,79 @@ msgstr "Déconnexion"
 msgid "Connection restored"
 msgstr "Connexion rétablie"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Aucune liste de lecture enregistrée."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Vos listes de lectures apparaîtrons ici."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Morceaux populaires"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Discographie"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albums"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistes"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Rechercher dans Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Saisissez un terme à rechercher."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Ajouter à..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Retirer"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Label"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Date de publication"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Morceaux"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Durée"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -162,51 +212,56 @@ msgstr "Nom d'utilisateur"
 msgid "Password"
 msgstr "Mot de passe"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Verr. Maj. est actif !"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "L'authentification a échoué !"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Connexion"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albums"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Annuler"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistes"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Tout sélectionner"
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
-msgstr "Titres aimés"
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Aléatoire"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Précédent"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Suivant"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Répéter"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
 msgid "You have no saved albums."
 msgstr "Aucun album dans votre bibliothèque."
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Vos albums apparaîtrons ici."
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr "Aucune liste de lecture enregistrée."
-
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr "Vos listes de lectures apparaîtrons ici."
-
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
-
+#~ msgid "by"
+#~ msgstr "par"
diff --git a/po/ia.po b/po/ia.po
index a4b70ce2..734d515d 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1,99 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "per"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Sigillo:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Lanciate:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Tracias:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duration:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Ocurreva un error. Verifica le registros pro detalios!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Vider album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Plus ab"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copiar ligamine"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Adder al cauda"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Remover ab cauda"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Adder a {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} canto seligite"
+msgstr[1] "{} cantos seligite"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Plus ab {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Non poteva salvar le contrasigno. Assecura te qui le magazin de claves es disblocate."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Ocurreva un error. Verifica le registros pro detalios!"
+msgstr ""
+"Non poteva salvar le contrasigno. Assecura te qui le magazin de claves es "
+"disblocate."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Bibliotheca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Listas de reproduction"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Tracias salvate"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Ora in reproduction"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Reproducer"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,23 +103,6 @@ msgstr "Ora in reproduction"
 msgid "No song playing"
 msgstr "Nulle canto in reproduction"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Resultatos de recerca pro"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Nulle canto seligite"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "canto seligite"
-msgstr[1] "cantos seligite"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -137,16 +122,79 @@ msgstr "Clauder le session"
 msgid "Connection restored"
 msgstr "Connexion restabilite"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Tu non ha listas de reproduction salvate."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Tu listas de reproduction essera monstrate hic."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Melior tracias"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Lanciamentos"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albumes"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistas"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Sigillo"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Lanciate"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Tracias"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duration"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -162,51 +210,56 @@ msgstr "Nomine de usator"
 msgid "Password"
 msgstr "Contrasigno"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Serratura de majusculas es activate!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Falleva le authentication!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Initiar session"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albumes"
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistas"
-
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Aleatori"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Previe"
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Sequente"
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Repeter"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Tu ha nulle albumes salvate."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Tu bibliotheca essera monstrate ci."
 
+#~ msgid "by"
+#~ msgstr "per"
diff --git a/po/id.po b/po/id.po
index d746e045..0119cb8c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,99 +1,99 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "oleh"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Label:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Dirilis:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Trek:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Durasi:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Hak Cipta:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Timbul galat. Periksa log untuk detailnya!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Lihat album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Lebih banyak dari"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Salin tautan"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Tambah ke Antrian"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Hapus dari antrian"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Tambah ke {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} lagu dipilih"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Lebih banyak dari {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Tak bisa menyimpan sandi. Pastikan bahwa kunci sesi tidak terkunci."
 
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Timbul galat. Periksa log untuk detailnya!"
-
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Pustaka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Daftar putar"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Trek yang disimpan"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Sedang memutar"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+#, fuzzy
+msgid "Play"
+msgstr "Daftar putar"
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,22 +101,6 @@ msgstr "Sedang memutar"
 msgid "No song playing"
 msgstr "Tidak ada lagu yang diputar"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Hasil pencarian untuk"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Tidak ada lagu yang dipilih"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "lagu dipilih"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -136,16 +120,79 @@ msgstr "Log keluar"
 msgid "Connection restored"
 msgstr "Sambungan dipulihkan"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Anda tidak memiliki daftar putar yang disimpan."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Daftar putar Anda akan ditampilkan di sini."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Trek teratas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Rilis"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Album"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artis"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Label"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Dirilis"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Trek"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Durasi"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Hak Cipta"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -161,51 +208,56 @@ msgstr "Nama Pengguna"
 msgid "Password"
 msgstr "Kata Sandi"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock diaktifkan!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Autentikasi gagal!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Log masuk"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Album"
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artis"
-
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
 msgstr ""
 
-#: 
-msgid "Caps Lock is enabled!"
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Anda tidak memiliki album yang disimpan."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Pustaka Anda akan ditampilkan di sini."
+
+#~ msgid "by"
+#~ msgstr "oleh"
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 00000000..0c70cf79
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,265 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "エラーが発生しました。詳細はログを確認してください。"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "アルバムを見る"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "リンクをコピー"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+msgid "Add to queue"
+msgstr "キューに追加"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "キューから削除"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "{}に追加"
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{}曲選択中"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+#, fuzzy
+msgid "More from {}"
+msgstr "詳細"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr ""
+"パスワードを保存できませんでした。セッションキーリングのロックを解除してくだ"
+"さい。"
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+msgid "Library"
+msgstr "ライブラリ"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+msgid "Playlists"
+msgstr "プレイリスト"
+
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "お気に入り"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+msgid "Now playing"
+msgstr "再生中"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "一時停止"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "再生"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "再生中の曲はありません"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+msgid "About"
+msgstr "このアプリについて"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+msgid "Quit"
+msgstr "終了"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+msgid "Log out"
+msgstr "ログアウト"
+
+#: src/app/state/login_state.rs:117
+msgid "Connection restored"
+msgstr "再接続しました"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "保存したプレイリストはありません。"
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "プレイリストがここに表示されます。"
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "人気のトラック"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+msgid "Releases"
+msgstr "作品"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "アルバム"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "アーティスト"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "検索する。"
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "検索ワードを入力してください。"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "プレイリストに追加…"
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "削除"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "レーベル"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "リリース"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "曲数"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "再生時間"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "著作権表示"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Spotifyプレミアムにログイン"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "ユーザー名"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "パスワード"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lockが有効になっています。"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "認証に失敗しました。"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "ログイン"
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "選択解除"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "すべて選択"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "ランダム"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "前"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "次"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "繰り返し"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "保存したアルバムがありません。"
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "ライブラリはここに表示されます。"
+
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/nb.po b/po/nb.po
index b2ba5edb..10f2eec7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,88 +9,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
+#: src/app/components/details/release_details.rs:89
 msgid "by"
 msgstr "av"
 
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Utgiver:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Utgitt:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Spor:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Varighet:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Vis album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Mer fra"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Kopier lenke"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Legg til i køen"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Fjern fra køen"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Legg i {}"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Kunne ikke lagre passordet. Sørg for at nøkkelringen til sesjonen er låst opp."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
 msgid "An error occured. Check logs for details!"
 msgstr "En feil oppstod. Sjekk logger for detaljer!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Bibliotek"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Spillelister"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Nå spiller"
 
@@ -101,23 +74,6 @@ msgstr "Nå spiller"
 msgid "No song playing"
 msgstr "Ingen sang spilles"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Søkeresultater for"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Ingen sang er valgt"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "sang valgt"
-msgstr[1] "sanger valgt"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -138,12 +94,12 @@ msgid "Connection restored"
 msgstr "Tilkoblingen er gjenopprettet"
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Topp spor"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Utgivelser"
 
@@ -163,50 +119,147 @@ msgid "Password"
 msgstr "Passord"
 
 #. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:95
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Autentiseringen mislyktes!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Logg inn"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
+#: src/app/components/search/search.ui:70
 msgid "Albums"
 msgstr "Album"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
+#: src/app/components/search/search.ui:103
 msgid "Artists"
 msgstr "Artister"
 
-#: src/app/components/navigation/home.rs:47
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
 msgid "Saved tracks"
 msgstr "Lagrede spor"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr "Du har ingen lagrede album."
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock er aktivert!"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr "Biblioteket ditt vises her."
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pause"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Spill av"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Tilfeldig"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Forrige"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Neste"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Gjenta"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
 msgstr "Du har ingen lagrede spillelister."
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
 msgid "Your playlists will be shown here."
 msgstr "Spillelistene dine vises her."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Du har ingen lagrede album."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Biblioteket ditt vises her."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+#, fuzzy
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} sang valgt"
+msgstr[1] "{} sanger valgt"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Søk Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Skriv for å søke."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Fjern"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Legg til spilleliste..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Velg alle"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Mer fra {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Utgiver"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Utgitt"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Spor"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Varighet"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Opphavsrett"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} av {}"
 
diff --git a/po/nl.po b/po/nl.po
index 59184fa6..3f2f46bc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,88 +9,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
+#: src/app/components/details/release_details.rs:89
 msgid "by"
 msgstr "van"
 
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Label:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Uitgebracht:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Nummers:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duur:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Album bekijken"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Meer van"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Link kopiëren"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Toevoegen aan wachtrij"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Verwijderen uit wachtrij"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Toevoegen aan {}"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Het wachtwoord kan niet worden opgeslagen - zorg dat de sessiesleutelhanger ontgrendeld is."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
 msgid "An error occured. Check logs for details!"
 msgstr "Er is een fout opgetreden - bekijk het logboek!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Verzameling"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Afspeellijsten"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Je luistert naar"
 
@@ -101,23 +74,6 @@ msgstr "Je luistert naar"
 msgid "No song playing"
 msgstr "Er wordt niks afgespeeld"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Zoekresultaten voor"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Geen nummer geselecteerd"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "nummer geselecteerd"
-msgstr[1] "nummers geselecteerd"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -138,12 +94,12 @@ msgid "Connection restored"
 msgstr "De verbinding is hersteld"
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Topnummers"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Uitgaven"
 
@@ -163,50 +119,146 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:95
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Het inloggen is mislukt."
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Inloggen"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
+#: src/app/components/search/search.ui:70
 msgid "Albums"
 msgstr "Albums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
+#: src/app/components/search/search.ui:103
 msgid "Artists"
 msgstr "Artiesten"
 
-#: src/app/components/navigation/home.rs:47
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
 msgid "Saved tracks"
 msgstr "Opgeslagen nummers"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr "Je hebt nog geen opgeslagen albums."
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock is ingeschakeld!"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr "Je verzameling wordt hier getoond."
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pauzeren"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Afspelen"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Willekeurig"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Vorige"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Volgende"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Herhalen"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
 msgstr "Je hebt nog geen opgeslagen afspeellijsten."
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
 msgid "Your playlists will be shown here."
 msgstr "Je afspeellijsten worden hier getoond."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock is ingeschakeld!"
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Je hebt nog geen opgeslagen albums."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Je verzameling wordt hier getoond."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} nummer geselecteerd"
+msgstr[1] "{} nummers geselecteerd"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Doorzoek Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Typ om te zoeken"
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Verwijderen"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Toevoegen aan afspeellijst…"
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Alles selecteren"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Meer van {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Label"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Uitgebracht"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Nummers"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duur"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} van {}"
 
diff --git a/po/pl.po b/po/pl.po
index d8d808d0..ed8aedd9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,99 +1,104 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "przez"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Wydawca"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr "Premiery"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr "Najlepsze piosenki"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Długość"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Prawa autorskie"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Wystąpił błąd. Sprawdź logi po więcej informacji!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Zobacz album"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Więcej od"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Skopiuj link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Dodaj do kolejki"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Usuń z kolejki"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Dodaj do"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} wybrana piosenka"
+msgstr[1] "{} wybrane piosenki"
+msgstr[2] "{} wybranych piosenek"
+msgstr[3] ""
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Więcej od {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Nie można zapisać hasła. Upewnij się że narzędzie zarządzające kluczami jest odblokowane."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Wystąpił błąd. Sprawdź logi po więcej informacji!"
+msgstr ""
+"Nie można zapisać hasła. Upewnij się że narzędzie zarządzające kluczami jest "
+"odblokowane."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Playlisty"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Zachowane piosenki"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Aktualnie odtwarzane"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -101,25 +106,6 @@ msgstr "Aktualnie odtwarzane"
 msgid "No song playing"
 msgstr "Aktualnie nie gra żadna piosenka"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Wyniki wyszukiwania dla"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Nie wybrano piosenki"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "wybrana piosenka"
-msgstr[1] "wybrane piosenki"
-msgstr[2] "wybranych piosenek"
-msgstr[3] ""
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +125,79 @@ msgstr "Wyloguj się"
 msgid "Connection restored"
 msgstr "Odzyskano połączenie"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Nie masz zapisanych playlist."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Twoje playlisty będą tu pokazane."
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Najlepsze piosenki"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Premiery"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albumy"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artyści"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Wydawca"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Premiery"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Najlepsze piosenki"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Długość"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +213,56 @@ msgstr "Nazwa użytkownika"
 msgid "Password"
 msgstr "Hasło"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock jest włączony!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Błąd autoryzacji!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Zaloguj"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albumy"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artyści"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
-msgstr "Zachowane piosenki"
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr ""
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
 msgid "You have no saved albums."
 msgstr "Nie masz zapisanych albumów."
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Twoja biblioteka będzie tu pokazana."
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
-msgstr "Nie masz zapisanych playlist."
-
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
-msgstr "Twoje playlisty będą tu pokazane."
-
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
-
+#~ msgid "by"
+#~ msgstr "przez"
diff --git a/po/pt-br.po b/po/pt-br.po
index 92286de5..4206d9d3 100644
--- a/po/pt-br.po
+++ b/po/pt-br.po
@@ -1,101 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: pt-br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: pt-br\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "por"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr ""
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Lançamentos"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "Melhores faixas"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duração"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr ""
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Ocorreu um erro. Verifique os logs para mais detalhes!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Ver álbum"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Mais de"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copiar link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Adicionar a fila"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Remover da fila"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Adicionar a {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} música selecionada"
+msgstr[1] "{} músicas selecionadas"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Mais de {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Não foi possível salvar a senha. Verifique se o seu chaveiro de sessão está desbloqueado."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Ocorreu um erro. Verifique os logs para mais detalhes!"
+msgstr ""
+"Não foi possível salvar a senha. Verifique se o seu chaveiro de sessão está "
+"desbloqueado."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Listas de reprodução"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr ""
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Tocando agora"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -103,23 +103,6 @@ msgstr "Tocando agora"
 msgid "No song playing"
 msgstr "Nenhum música sendo executada"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Procurar por"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Nenhuma música selecionada"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "música selecionada"
-msgstr[1] "músicas selecionadas"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +122,79 @@ msgstr "Sair"
 msgid "Connection restored"
 msgstr "Conexão reestabelecida"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Melhores faixas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Lançamentos"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Álbuns"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistas"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Editora"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Lançamento"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Faixas"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duração"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +210,56 @@ msgstr "Nome de usuário"
 msgid "Password"
 msgstr "Senha"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr ""
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "A autenticação falhou!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Entrar"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Álbuns"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistas"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
 msgstr ""
 
-#: 
-msgid "Caps Lock is enabled!"
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
 msgstr ""
 
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/pt.po b/po/pt.po
index 0182da3b..b315fcf0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,101 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr "por"
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr "Editora:"
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Lançamento:"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "Faixas:"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr "Duração:"
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr "Copyright:"
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Ocorreu um erro! Verifique os logs para mais detalhes!"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Ver álbum"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Mais de"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Copiar ligação"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Adicionar à fila"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Remover da fila"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "Adicionar a {}"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} canção selecionada"
+msgstr[1] "{} canções selecionadas"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Mais de {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Não foi possível guardar a palavra-passe. Garanta que o chaveiro da sessão está desbloqueado."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Ocorreu um erro! Verifique os logs para mais detalhes!"
+msgstr ""
+"Não foi possível guardar a palavra-passe. Garanta que o chaveiro da sessão "
+"está desbloqueado."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Listas de reprodução"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr ""
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "A reproduzir"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -103,23 +103,6 @@ msgstr "A reproduzir"
 msgid "No song playing"
 msgstr "Nenhuma canção a ser reproduzida"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Pesquisar resultados para"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Nenhuma canção selecionada"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "canção selecionada"
-msgstr[1] "canções selecionadas"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +122,79 @@ msgstr "Terminar sessão"
 msgid "Connection restored"
 msgstr "Conexão restaurada"
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Melhores faixas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Lançamentos"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Álbums"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artistas"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Editora"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Lançamento"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Faixas"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Duração"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +210,56 @@ msgstr "Utilizador"
 msgid "Password"
 msgstr "Palavra-passe"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr ""
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Autenticação falhou!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Autenticar"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Álbums"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Artistas"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
 msgstr ""
 
-#: 
-msgid "Caps Lock is enabled!"
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
 msgstr ""
 
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/ru.po b/po/ru.po
index 8c9d5f8c..fc720d60 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,92 +9,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
+#: src/app/components/details/release_details.rs:89
 msgid "by"
-msgstr ""
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr ""
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Релизы"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "Топ треков"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr ""
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr ""
+msgstr "в исполнении"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Посмотреть альбом"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Больше от"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Скопировать ссылку"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Добавить в очередь"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Удалить из очереди"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
-msgstr ""
+msgstr "Добавить в {}"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Не удалось сохранить пароль. Проверьте, GNOME Keyring/KDE wallet открыта."
+msgstr "Не удалось сохранить пароль. Убедитесь, что связка ключей сеанса разблокирована."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
 msgid "An error occured. Check logs for details!"
-msgstr "Ошибка появилась. Посмотрите в логи за подробностями!"
+msgstr "Произошла ошибка. Смотрите подробности в логах!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
-msgstr "Библиотека"
+msgstr "Фонотека"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Плейлисты"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
-msgstr "Сейчас играет"
+msgstr "Воспроизводится сейчас"
 
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
@@ -103,29 +74,10 @@ msgstr "Сейчас играет"
 msgid "No song playing"
 msgstr "Песня сейчас не играет"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Результаты поиска для"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Песня не выбрана"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "песня выбрана"
-msgstr[1] "песни выбраны"
-msgstr[2] "песни были выбраны"
-msgstr[3] ""
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
-msgstr "Об"
+msgstr "О Spot"
 
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:58
@@ -142,12 +94,12 @@ msgid "Connection restored"
 msgstr "Подключение восстановлено"
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Топ треков"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Релизы"
 
@@ -167,50 +119,148 @@ msgid "Password"
 msgstr "Пароль"
 
 #. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:95
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Вход не удался!"
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Войти"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
+#: src/app/components/search/search.ui:70
 msgid "Albums"
 msgstr "Альбомы"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
+#: src/app/components/search/search.ui:103
 msgid "Artists"
-msgstr "Артисты"
+msgstr "Исполнители"
 
-#: src/app/components/navigation/home.rs:47
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
 msgid "Saved tracks"
-msgstr ""
+msgstr "Сохраненные треки"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
-msgstr ""
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock включен!"
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
-msgstr ""
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Пауза"
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Воспроизведение"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Перемешать"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Предыдущий"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Следующий"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Повторить"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
-msgstr ""
+msgstr "У вас нет сохраненных плейлистов."
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
 msgid "Your playlists will be shown here."
-msgstr ""
+msgstr "Здесь будут показаны ваши плейлисты."
 
-#: 
-msgid "Caps Lock is enabled!"
-msgstr ""
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "У вас нет сохраненных альбомов."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Здесь будет показана ваша фонотека."
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} композиция выбрана"
+msgstr[1] "{} композиции выбраны"
+msgstr[2] "{} композиций выбрано"
+msgstr[3] ""
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Поиск в Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Введите для поиска."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Удалить"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Добавить в плейлист..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Отменить"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Выбрать все"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Больше от {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Лейбл"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Релизы"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Треки"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Авторское право"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} В исполнении {}"
 
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 00000000..ccad2a1d
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,267 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Napaka! Poglej v dnevnik od programa za podrobnosti."
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "Oglej si album"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "Kopiraj povezavo"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+msgid "Add to queue"
+msgstr "Dodaj v vrsto"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "Odstrani iz vrste"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "Dodaj na {}"
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} izbrana skladba"
+msgstr[1] "{} izbrani skladbi"
+msgstr[2] "{} izbrane skladbe"
+msgstr[3] "{} izbranih skladb"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Več od {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr ""
+"Gesla ni bilo mogoče shraniti. Preveri, da je session keyring odklenjen."
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+msgid "Library"
+msgstr "Moja zbirka"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+msgid "Playlists"
+msgstr "Seznami predvajanja"
+
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Shranjene skladbe"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+msgid "Now playing"
+msgstr "Se predvaja"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Premor"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Predvajaj"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "Ni skladb za predvajanje"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+msgid "About"
+msgstr "O programu"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+msgid "Quit"
+msgstr "Izhod"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+msgid "Log out"
+msgstr "Odjava"
+
+#: src/app/state/login_state.rs:117
+msgid "Connection restored"
+msgstr "Povezava ponovno vzpovstavljena"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Nimaš shranjenih seznamov predvajanja."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Tvoji seznami predvajanja bodo prikazani tukaj."
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "Priljubljene skladbe"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+msgid "Releases"
+msgstr "Izdaje"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albumi"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Izvajalci"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Razišči Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Napiši za iskanje."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Dodaj na seznam predvajanja..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Odstrani"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Založba"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Izdano"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Skladbe"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Trajanje"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Avtorska pravica"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Prijava v Spotify Premium"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "Geslo"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Velike črke so vklopljene!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "Preverjanje pristnosti ni bilo uspešno!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "Prijava"
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Izberi vse"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Naključno predvajanje"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Prejšna skladba"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Naslednja skladba"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Ponavljajoče predvajanje"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Nimaš shranjenih albumov."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Tvoja zbirka bo prikazana tukaj."
+
+#~ msgid "by"
+#~ msgstr "od"
diff --git a/po/spot.pot b/po/spot.pot
index 2ceaa875..e68de333 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-27 13:19-0400\n"
+"POT-Creation-Date: 2021-12-22 18:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,98 +19,90 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:108
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:118
 msgid "An error occured. Check logs for details!"
 msgstr ""
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr ""
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr ""
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-msgid "Released:"
-msgstr ""
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-msgid "Tracks:"
-msgstr ""
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr ""
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr ""
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr ""
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr ""
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr ""
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr ""
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr ""
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr ""
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr ""
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr ""
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr ""
 
-#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:42
+#. translators: This is a sidebar entry that marks that the entries below are playlists.
+#: src/app/components/navigation/factory.rs:47
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr ""
 
 #. translators: This is a sidebar entry to browse to saved tracks.
-#. This is the visible name for the list of liked songs. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:48
-#: src/app/components/saved_tracks/saved_tracks.ui:14
+#: src/app/components/navigation/factory.rs:76
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing.ui:14
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr ""
 
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
 #: src/app/components/playback/playback_controls.rs:64
 msgid "Pause"
 msgstr ""
@@ -126,23 +118,6 @@ msgstr ""
 msgid "No song playing"
 msgstr ""
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr ""
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr ""
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] ""
-msgstr[1] ""
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -162,32 +137,79 @@ msgstr ""
 msgid "Connection restored"
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:17
-msgid "Shuffle"
-msgstr ""
-
-#: src/app/components/playback/playback_controls.ui:27
-msgid "Previous"
-msgstr ""
-
-#: src/app/components/playback/playback_controls.ui:50
-msgid "Next"
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:60
-msgid "Repeat"
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
 msgstr ""
 
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr ""
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr ""
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr ""
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr ""
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr ""
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr ""
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr ""
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr ""
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr ""
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -218,14 +240,30 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#. A title that is shown when the user has not saved any playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:26
-msgid "You have no saved playlists."
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
 msgstr ""
 
-#. A description of what happens when the user has saved playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:27
-msgid "Your playlists will be shown here."
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
 #. A title that is shown when the user has not saved any albums.
@@ -237,13 +275,3 @@ msgstr ""
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr ""
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr ""
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 09867e70..6673c0ef 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,101 +1,101 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Spot\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:101
-msgid "by"
-msgstr ""
-
-#. translators: This refers to a music label
-#: src/app/components/details/release_details.rs:108
-msgid "Label:"
-msgstr ""
-
-#. translators: This refers to a release date
-#: src/app/components/details/release_details.rs:115
-#, fuzzy
-msgid "Released:"
-msgstr "Parçalar"
-
-#. translators: This refers to a number of tracks
-#: src/app/components/details/release_details.rs:122
-#, fuzzy
-msgid "Tracks:"
-msgstr "En çok dinlenenler"
-
-#. translators: This refers to the duration of eg. an album
-#: src/app/components/details/release_details.rs:129
-msgid "Duration:"
-msgstr ""
-
-#. translators: Self explanatory
-#: src/app/components/details/release_details.rs:136
-msgid "Copyright:"
-msgstr ""
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Bir hata meydana geldi. Günlükleri kontrol edin."
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
 msgstr "Albümü görüntüle"
 
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:8
-msgid "More from"
-msgstr "Daha fazla"
-
 #. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
-#: src/app/components/labels.rs:11
+#: src/app/components/labels.rs:8
 msgid "Copy link"
 msgstr "Bağlantıyı kopyala"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
-#: src/app/components/labels.rs:14
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
 msgid "Add to queue"
 msgstr "Sıraya ekle"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
-#: src/app/components/labels.rs:17
+#: src/app/components/labels.rs:14
 msgid "Remove from queue"
 msgstr "Sıradan çıkar"
 
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-#: src/app/components/labels.rs:24
+#: src/app/components/labels.rs:21
 msgid "Add to {}"
 msgstr "{} listesine ekle"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} seçildi"
+msgstr[1] "{} seçildi"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Daha fazla {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
-#: src/app/components/login/login_model.rs:52
+#: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Şifreniz kaydedilemedi. Oturum anahtarlığınızın kilidinin açık olduğundan emin olun."
-
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/components/mod.rs:108
-msgid "An error occured. Check logs for details!"
-msgstr "Bir hata meydana geldi. Günlükleri kontrol edin."
+msgstr ""
+"Şifreniz kaydedilemedi. Oturum anahtarlığınızın kilidinin açık olduğundan "
+"emin olun."
 
 #. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
 #: src/app/components/navigation/home.rs:36
 msgid "Library"
 msgstr "Kütüphane"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
 #: src/app/components/navigation/home.rs:42
 msgid "Playlists"
 msgstr "Oynatma listesi"
 
-#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:52
-#: src/app/components/now_playing/now_playing.ui:14
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr ""
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
 msgid "Now playing"
 msgstr "Şu an oynatılıyor"
 
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -103,23 +103,6 @@ msgstr "Şu an oynatılıyor"
 msgid "No song playing"
 msgstr "Herhangi bir şarkı oynatılmıyor"
 
-#. translators: This text is part of a larger text that says "Search results for <search term>".
-#: src/app/components/search/search.rs:102
-msgid "Search results for"
-msgstr "Arama sonuçları"
-
-#. This text appears when entering selection mode. It should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:73 src/window.ui.in:51
-msgid "No song selected"
-msgstr "Herhangi bir şarkı seçilmedi"
-
-#. translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-#: src/app/components/selection/selection_heading.rs:87
-msgid "song selected"
-msgid_plural "songs selected"
-msgstr[0] "seçildi"
-msgstr[1] "seçildi"
-
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -139,16 +122,81 @@ msgstr "Oturumdan çık"
 msgid "Connection restored"
 msgstr "Bağlantı geri yüklendi."
 
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
-#: src/app/components/artist_details/artist_details.ui:40
+#: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "En çok dinlenenler"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:71
+#: src/app/components/artist_details/artist_details.ui:55
 msgid "Releases"
 msgstr "Parçalar"
 
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Albümler"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Sanatçılar"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr ""
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+#, fuzzy
+msgid "Released"
+msgstr "Parçalar"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+#, fuzzy
+msgid "Tracks"
+msgstr "En çok dinlenenler"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr ""
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr ""
+
 #. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
 #: src/app/components/login/login.ui:45
 msgid "Login to Spotify Premium"
@@ -164,51 +212,53 @@ msgstr "Kullanıcı adı"
 msgid "Password"
 msgstr "Şifre"
 
-#. This error is shown when authentication fails.
+#. This information is shown when Caps Lock is enabled.
 #: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr ""
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
 msgid "Authentication failed!"
 msgstr "Kimlik doğrulama başarısız."
 
 #. Log in button label
-#: src/app/components/login/login.ui:110
+#: src/app/components/login/login.ui:141
 msgid "Log in"
 msgstr "Giriş yap"
 
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:66
-msgid "Albums"
-msgstr "Albümler"
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:99
-msgid "Artists"
-msgstr "Sanatçılar"
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
 
-#: src/app/components/navigation/home.rs:47
-msgid "Saved tracks"
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any albums."
-msgid "You have no saved albums."
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved albums."
-msgid "Your library will be shown here."
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
 msgstr ""
 
-#: 
-msgctxt "A title that is shown when the user has not saved any playlists."
-msgid "You have no saved playlists."
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
 msgstr ""
 
-#: 
-msgctxt "A description of what happens when the user has saved playlists."
-msgid "Your playlists will be shown here."
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
 msgstr ""
 
-#: 
-msgid "Caps Lock is enabled!"
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
 msgstr ""
 
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr ""
diff --git a/src/api/api_models.rs b/src/api/api_models.rs
index 71945983..61525997 100644
--- a/src/api/api_models.rs
+++ b/src/api/api_models.rs
@@ -96,6 +96,7 @@ impl<T> Page<T> {
     pub fn limit(&self) -> usize {
         self.limit
             .or_else(|| Some(self.items.as_ref()?.len()))
+            .filter(|limit| *limit > 0)
             .unwrap_or(50)
     }
 
@@ -198,6 +199,7 @@ pub struct Album {
     pub id: String,
     pub tracks: Option<Page<AlbumTrackItem>>,
     pub artists: Vec<Artist>,
+    pub release_date: Option<String>,
     pub name: String,
     pub images: Vec<Image>,
 }
@@ -205,7 +207,6 @@ pub struct Album {
 #[derive(Deserialize, Debug, Clone)]
 pub struct AlbumInfo {
     pub label: String,
-    pub release_date: String,
     pub copyrights: Vec<Copyright>,
 }
 
@@ -280,14 +281,14 @@ pub struct BadTrackItem {}
 #[derive(Deserialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum FailibleTrackItem {
-    Ok(TrackItem),
+    Ok(Box<TrackItem>),
     Failing(BadTrackItem),
 }
 
 impl FailibleTrackItem {
     fn get(self) -> Option<TrackItem> {
         match self {
-            Self::Ok(track) => Some(track),
+            Self::Ok(track) => Some(*track),
             Self::Failing(_) => None,
         }
     }
@@ -311,23 +312,13 @@ impl TryFrom<PlaylistTrack> for TrackItem {
     type Error = ();
 
     fn try_from(PlaylistTrack { is_local, track }: PlaylistTrack) -> Result<Self, Self::Error> {
-        track
-            .ok_or(())?
-            .get()
-            .filter(|_| !is_local)
-            .map(|mut track| {
-                std::mem::take(&mut track.track.track_number);
-                track
-            })
-            .ok_or(())
+        track.ok_or(())?.get().filter(|_| !is_local).ok_or(())
     }
 }
 
 impl From<SavedTrack> for TrackItem {
     fn from(track: SavedTrack) -> Self {
-        let mut track = track.track;
-        std::mem::take(&mut track.track.track_number);
-        track
+        track.track
     }
 }
 
@@ -368,8 +359,7 @@ where
         };
         let songs = page
             .into_iter()
-            .enumerate()
-            .filter_map(|(i, t)| {
+            .filter_map(|t| {
                 let TrackItem { track, album } = t.try_into().ok()?;
                 let AlbumTrackItem {
                     artists,
@@ -379,7 +369,6 @@ where
                     duration_ms,
                     track_number,
                 } = track;
-                let track_number = track_number.unwrap_or_else(|| batch.offset + i + 1) as u32;
                 let artists = artists
                     .into_iter()
                     .map(|a| ArtistRef {
@@ -402,7 +391,7 @@ where
 
                 Some(SongDescription {
                     id,
-                    track_number,
+                    track_number: track_number.map(|u| u as u32),
                     uri,
                     title: name,
                     artists,
@@ -458,6 +447,7 @@ impl From<Album> for AlbumDescription {
             id: album.id,
             title: album.name,
             artists,
+            release_date: album.release_date,
             art,
             songs,
             is_liked: false,
@@ -466,13 +456,7 @@ impl From<Album> for AlbumDescription {
 }
 
 impl From<AlbumInfo> for AlbumReleaseDetails {
-    fn from(
-        AlbumInfo {
-            label,
-            release_date,
-            copyrights,
-        }: AlbumInfo,
-    ) -> Self {
+    fn from(AlbumInfo { label, copyrights }: AlbumInfo) -> Self {
         let copyright_text = copyrights
             .iter()
             .map(|c| format!("[{}] {}", c.type_, c.text))
@@ -481,7 +465,6 @@ impl From<AlbumInfo> for AlbumReleaseDetails {
 
         Self {
             label,
-            release_date,
             copyright_text,
         }
     }
diff --git a/src/api/client.rs b/src/api/client.rs
index ca50b50b..95255a98 100644
--- a/src/api/client.rs
+++ b/src/api/client.rs
@@ -223,7 +223,7 @@ impl SpotifyClient {
             .headers()
             .get("cache-control")
             .and_then(|header| header.to_str().ok())
-            .and_then(|s| Self::parse_cache_control(s));
+            .and_then(Self::parse_cache_control);
 
         match result.status() {
             s if s.is_success() => Ok(SpotifyResponse {
diff --git a/src/app.css b/src/app.css
index ba434e96..a623528c 100644
--- a/src/app.css
+++ b/src/app.css
@@ -1,18 +1,21 @@
 @define-color accent_bg_color @green_5;
+@define-color accent_color @green_3;
 
 .notification {
   opacity: 0;
   transition: opacity 0.3s ease;
+  border-radius: 6px;
 }
 
 .notification--shown {
   opacity: 1;
 }
 
-headerbar.selection-mode {
-  background-color: @theme_selected_bg_color;
+.container {
+  transition: opacity 0.3s ease;
+  opacity: 0;
 }
 
-button.tool, menubutton.tool {
-  -gtk-icon-size: 25px;
+.container--loaded {
+  opacity: 1;
 }
diff --git a/src/app/components/album/album.css b/src/app/components/album/album.css
index 261d10fe..9226f528 100644
--- a/src/app/components/album/album.css
+++ b/src/app/components/album/album.css
@@ -1,45 +1,34 @@
-.album {
-  opacity: 0;
-  transition: opacity 300ms ease;
-}
-
-.album--loaded {
-  opacity: 1;
-}
-
 /* large style */
 
-leaflet.unfolded .album .album__cover {
+leaflet.unfolded .album .card {
   min-width: 200px;
   min-height: 200px;
+  border-radius: 6px;
 }
 
-/* small style */
-
-leaflet.folded .album .album__cover {
-  min-width: 100px;
-  min-height: 100px;
+leaflet.unfolded .album {
+  margin-top: 6px;
+  margin-bottom: 6px;
 }
 
-.album .album__cover {
-  padding: 0;
-  border-radius: 0;
+leaflet.unfolded .album button {
+ border-radius: 12px;
 }
+/* small style */
 
-.album label.album__title {
-  font-size: 16px;
-  font-weight: bold;
+leaflet.folded .album .card {
+  min-width: 100px;
+  min-height: 100px;
+  border-radius: 6px;
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
 
-.album label.album__artist {
-  font-size: 14px;
+leaflet.unfolded .album {
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
 
-.album__cover image {
-  border-radius: 4px;
-  transition: all 100ms ease;
+leaflet.folded .album button {
+ border-radius: 6px;
 }
-
-.album__cover:hover image {
-  filter: brightness(1.15);
-}
\ No newline at end of file
diff --git a/src/app/components/album/album.rs b/src/app/components/album/album.rs
index 3cccb94c..014eb858 100644
--- a/src/app/components/album/album.rs
+++ b/src/app/components/album/album.rs
@@ -6,6 +6,7 @@ use crate::app::models::AlbumModel;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
+use libadwaita::subclass::prelude::BinImpl;
 
 mod imp {
 
@@ -20,6 +21,9 @@ mod imp {
         #[template_child]
         pub artist_label: TemplateChild<gtk::Label>,
 
+        #[template_child]
+        pub year_label: TemplateChild<gtk::Label>,
+
         #[template_child]
         pub cover_btn: TemplateChild<gtk::Button>,
 
@@ -31,7 +35,7 @@ mod imp {
     impl ObjectSubclass for AlbumWidget {
         const NAME: &'static str = "AlbumWidget";
         type Type = super::AlbumWidget;
-        type ParentType = gtk::Box;
+        type ParentType = libadwaita::Bin;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -44,11 +48,11 @@ mod imp {
 
     impl ObjectImpl for AlbumWidget {}
     impl WidgetImpl for AlbumWidget {}
-    impl BoxImpl for AlbumWidget {}
+    impl BinImpl for AlbumWidget {}
 }
 
 glib::wrapper! {
-    pub struct AlbumWidget(ObjectSubclass<imp::AlbumWidget>) @extends gtk::Widget, gtk::Box;
+    pub struct AlbumWidget(ObjectSubclass<imp::AlbumWidget>) @extends gtk::Widget, libadwaita::Bin;
 }
 
 impl AlbumWidget {
@@ -65,7 +69,7 @@ impl AlbumWidget {
 
     fn set_loaded(&self) {
         let context = self.style_context();
-        context.add_class("album--loaded");
+        context.add_class("container--loaded");
     }
 
     fn set_image(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
@@ -101,6 +105,18 @@ impl AlbumWidget {
             .bind_property("artist", &*widget.artist_label, "label")
             .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
             .build();
+
+        match album_model.year() {
+            Some(_) => {
+                album_model
+                    .bind_property("year", &*widget.year_label, "label")
+                    .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                    .build();
+            }
+            None => {
+                widget.year_label.hide();
+            }
+        }
     }
 
     pub fn connect_album_pressed<F: Fn(&Self) + 'static>(&self, f: F) {
diff --git a/src/app/components/album/album.ui b/src/app/components/album/album.ui
index 46e1fdf4..c13f09a4 100644
--- a/src/app/components/album/album.ui
+++ b/src/app/components/album/album.ui
@@ -2,55 +2,76 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="AlbumWidget" parent="GtkBox">
-    <property name="halign">center</property>
-    <property name="valign">start</property>
-    <property name="margin-start">8</property>
-    <property name="margin-end">8</property>
-    <property name="margin-top">8</property>
-    <property name="margin-bottom">8</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">8</property>
+  <template class="AlbumWidget" parent="AdwBin">
     <child>
       <object class="GtkButton" id="cover_btn">
-        <property name="has-frame">0</property>
+      <property name="hexpand">0</property>
+      <property name="halign">center</property>
         <child>
-          <object class="GtkImage" id="cover_image">
-            <property name="icon-name">media-playback-start-symbolic</property>
+          <object class="GtkBox">
+					<property name="halign">center</property>
+					<property name="valign">start</property>
+					<property name="margin-top">6</property>
+					<property name="margin-bottom">6</property>
+					<property name="orientation">vertical</property>
+					<property name="spacing">6</property>
+            <child>
+            <object class="GtkImage" id="cover_image">
+              <property name="icon-name">media-playback-start-symbolic</property>
+              <style>
+              <class name="card"/>
+              </style>
+            </object>
+            </child>
+            <child>
+            <object class="GtkLabel" id="album_label">
+              <property name="label">Album</property>
+              <property name="justify">center</property>
+              <property name="wrap">1</property>
+              <property name="wrap-mode">word</property>
+              <property name="ellipsize">end</property>
+              <property name="max-width-chars">1</property>
+              <property name="margin-top">6</property>
+              <style>
+                <class name="title-4"/>
+              </style>
+            </object>
+          </child>
+          <child>
+            <object class="GtkLabel" id="artist_label">
+              <property name="label">Artist</property>
+              <property name="justify">center</property>
+              <property name="wrap">1</property>
+              <property name="wrap-mode">word</property>
+              <property name="ellipsize">end</property>
+              <property name="max-width-chars">1</property>
+              <style>
+                <class name="body"/>
+              </style>
+            </object>
+          </child>
+          <child>
+          <object class="GtkLabel" id="year_label">
+            <property name="label">Year</property>
+            <property name="justify">center</property>
+            <property name="wrap">1</property>
+            <property name="wrap-mode">word-char</property>
+            <property name="max-width-chars">1</property>
+            <property name="sensitive">0</property>
+            <style>
+              <class name="body"/>
+            </style>
           </object>
         </child>
-        <style>
-          <class name="album__cover"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="album_label">
-        <property name="label">Album</property>
-        <property name="justify">center</property>
-        <property name="wrap">1</property>
-        <property name="wrap-mode">word-char</property>
-        <property name="ellipsize">end</property>
-        <property name="max-width-chars">1</property>
-        <property name="lines">2</property>
-        <style>
-          <class name="album__title"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="artist_label">
-        <property name="label">Artist</property>
-        <property name="justify">center</property>
-        <property name="wrap">1</property>
-        <property name="wrap-mode">word-char</property>
-        <property name="max-width-chars">1</property>
-        <style>
-          <class name="album__artist"/>
-        </style>
+        </object>
+        </child>
+				<style>
+					<class name="flat"/>
+			  </style>
       </object>
     </child>
     <style>
+			<class name="container"/>
       <class name="album"/>
     </style>
   </template>
diff --git a/src/app/components/artist/mod.rs b/src/app/components/artist/mod.rs
index 5c460b7e..3d3cac04 100644
--- a/src/app/components/artist/mod.rs
+++ b/src/app/components/artist/mod.rs
@@ -75,7 +75,7 @@ impl ArtistWidget {
                 if let Some(avatar) = avatar.upgrade() {
                     let loader = ImageLoader::new();
                     let pixbuf = loader.load_remote(&url, "jpg", 200, 200).await;
-                    let texture = pixbuf.as_ref().map(|p| gdk::Texture::for_pixbuf(p));
+                    let texture = pixbuf.as_ref().map(gdk::Texture::for_pixbuf);
                     avatar.set_custom_image(texture.as_ref());
                 }
             });
diff --git a/src/app/components/artist_details/artist_details.rs b/src/app/components/artist_details/artist_details.rs
index d917603c..0425621c 100644
--- a/src/app/components/artist_details/artist_details.rs
+++ b/src/app/components/artist_details/artist_details.rs
@@ -21,9 +21,6 @@ mod imp {
         #[template_child]
         pub scrolled_window: TemplateChild<gtk::ScrolledWindow>,
 
-        #[template_child]
-        pub artist_name: TemplateChild<gtk::Label>,
-
         #[template_child]
         pub top_tracks: TemplateChild<gtk::ListView>,
 
@@ -69,10 +66,9 @@ impl ArtistDetailsWidget {
         self.widget().top_tracks.as_ref()
     }
 
-    fn set_artist_name(&self, name: &str) {
+    fn set_loaded(&self) {
         let context = self.style_context();
         context.add_class("artist__loaded");
-        self.widget().artist_name.set_text(name);
     }
 
     fn connect_bottom_edge<F>(&self, f: F)
@@ -132,7 +128,7 @@ impl ArtistDetails {
 
         if let Some(store) = model.get_list_store() {
             widget.bind_artist_releases(
-                worker,
+                worker.clone(),
                 &*store,
                 clone!(@weak model => move |id| {
                     model.open_album(id);
@@ -143,6 +139,8 @@ impl ArtistDetails {
         let playlist = Box::new(Playlist::new(
             widget.top_tracks_widget().clone(),
             Rc::clone(&model),
+            worker,
+            true,
         ));
 
         Self {
@@ -151,12 +149,6 @@ impl ArtistDetails {
             children: vec![playlist],
         }
     }
-
-    fn update_details(&mut self) {
-        if let Some(name) = self.model.get_artist_name() {
-            self.widget.set_artist_name(&name);
-        }
-    }
 }
 
 impl Component for ArtistDetails {
@@ -175,7 +167,7 @@ impl EventListener for ArtistDetails {
             AppEvent::BrowserEvent(BrowserEvent::ArtistDetailsUpdated(id))
                 if id == &self.model.id =>
             {
-                self.update_details();
+                self.widget.set_loaded();
             }
             _ => {}
         }
diff --git a/src/app/components/artist_details/artist_details.ui b/src/app/components/artist_details/artist_details.ui
index fa082a6a..974e3301 100644
--- a/src/app/components/artist_details/artist_details.ui
+++ b/src/app/components/artist_details/artist_details.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
+  <requires lib="gtk" version="4.0" />
   <template class="ArtistDetailsWidget" parent="GtkBox">
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
@@ -15,20 +15,6 @@
             <property name="margin-bottom">8</property>
             <property name="orientation">vertical</property>
             <property name="spacing">16</property>
-            <child>
-              <object class="GtkLabel" id="artist_name">
-                <property name="halign">start</property>
-                <property name="margin-start">8</property>
-                <property name="margin-end">8</property>
-                <property name="label">Artist</property>
-                <property name="wrap">1</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="artist_details--name"/>
-                  <class name="large-title"/>
-                </style>
-              </object>
-            </child>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
@@ -39,16 +25,12 @@
                     <property name="margin-end">8</property>
                     <property name="label" translatable="yes" comments="Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.">Top tracks</property>
                     <style>
-                      <class name="title-4"/>
+                      <class name="title-4" />
                     </style>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkListView" id="top_tracks">
-                    <style>
-                      <class name="artist__top-tracks"/>
-                    </style>
-                  </object>
+                  <object class="GtkListView" id="top_tracks"/>
                 </child>
               </object>
             </child>
@@ -78,7 +60,7 @@
       </object>
     </child>
     <style>
-      <class name="artist"/>
+      <class name="artist" />
     </style>
   </template>
 </interface>
diff --git a/src/app/components/artist_details/artist_details_model.rs b/src/app/components/artist_details/artist_details_model.rs
index 21a658bb..94316d9f 100644
--- a/src/app/components/artist_details/artist_details_model.rs
+++ b/src/app/components/artist_details/artist_details_model.rs
@@ -2,12 +2,11 @@ use gio::prelude::*;
 use gio::SimpleActionGroup;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use crate::api::SpotifyApiClient;
-use crate::app::components::{labels, PlaylistModel, SelectionTool, SelectionToolsModel};
-use crate::app::components::{AddSelectionTool, SimpleSelectionTool};
+use crate::app::components::SimpleHeaderBarModel;
+use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
+use crate::app::state::SelectionContext;
 use crate::app::state::{
     BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
 };
@@ -28,7 +27,7 @@ impl ArtistDetailsModel {
         }
     }
 
-    fn tracks_ref(&self) -> Option<impl Deref<Target = Vec<SongDescription>> + '_> {
+    fn songs_ref(&self) -> Option<impl Deref<Target = Vec<SongDescription>> + '_> {
         self.app_model
             .map_state_opt(|s| Some(&s.browser.artist_state(&self.id)?.top_tracks))
     }
@@ -88,7 +87,7 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 
     fn play_song_at(&self, _pos: usize, id: &str) {
-        let tracks = self.tracks_ref();
+        let tracks = self.songs_ref();
         if let Some(tracks) = tracks {
             self.dispatcher
                 .dispatch(PlaybackAction::LoadSongs(tracks.clone()).into());
@@ -102,7 +101,7 @@ impl PlaylistModel for ArtistDetailsModel {
             event,
             AppEvent::BrowserEvent(BrowserEvent::ArtistDetailsUpdated(id)) if id == &self.id
         ) {
-            let tracks = self.tracks_ref()?;
+            let tracks = self.songs_ref()?;
             Some(ListDiff::Set(tracks.iter().map(|s| s.into()).collect()))
         } else {
             None
@@ -110,7 +109,7 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
-        let songs = self.tracks_ref()?;
+        let songs = self.songs_ref()?;
         let song = songs.iter().find(|&song| song.id == id)?;
 
         let group = SimpleActionGroup::new();
@@ -126,18 +125,14 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
-        let songs = self.tracks_ref()?;
+        let songs = self.songs_ref()?;
         let song = songs.iter().find(|&song| song.id == id)?;
 
         let menu = gio::Menu::new();
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
         for artist in song.artists.iter().filter(|a| self.id != a.id) {
             menu.append(
-                Some(&format!(
-                    "{} {}",
-                    *labels::MORE_FROM,
-                    glib::markup_escape_text(&artist.name)
-                )),
+                Some(&labels::more_from_label(&artist.name)),
                 Some(&format!("song.view_artist_{}", artist.id)),
             );
         }
@@ -149,7 +144,7 @@ impl PlaylistModel for ArtistDetailsModel {
 
     fn select_song(&self, id: &str) {
         let song = self
-            .tracks_ref()
+            .songs_ref()
             .and_then(|songs| songs.iter().find(|&song| song.id == id).cloned());
         if let Some(song) = song {
             self.dispatcher
@@ -164,7 +159,7 @@ impl PlaylistModel for ArtistDetailsModel {
 
     fn enable_selection(&self) -> bool {
         self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(true));
+            .dispatch(AppAction::EnableSelection(SelectionContext::Default));
         true
     }
 
@@ -173,44 +168,27 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 }
 
-impl SelectionToolsModel for ArtistDetailsModel {
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher> {
-        self.dispatcher.box_clone()
+impl SimpleHeaderBarModel for ArtistDetailsModel {
+    fn title(&self) -> Option<String> {
+        Some(self.get_artist_name()?.clone())
     }
 
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync> {
-        self.app_model.get_spotify()
-    }
-
-    fn tools_visible(&self, _: &SelectionState) -> Vec<SelectionTool> {
-        let mut playlists: Vec<SelectionTool> = self
-            .app_model
-            .get_state()
-            .logged_user
-            .playlists
-            .iter()
-            .map(|p| SelectionTool::Add(AddSelectionTool::AddToPlaylist(p.clone())))
-            .collect();
-        let mut tools = vec![
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll),
-            SelectionTool::Add(AddSelectionTool::AddToQueue),
-        ];
-        tools.append(&mut playlists);
-        tools
+    fn title_updated(&self, event: &AppEvent) -> bool {
+        matches!(
+            event,
+            AppEvent::BrowserEvent(BrowserEvent::ArtistDetailsUpdated(_))
+        )
     }
 
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        Some(Box::new(self.app_model.map_state(|s| &s.selection)))
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        Some(&SelectionContext::Default)
     }
 
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll) => {
-                if let Some(songs) = self.tracks_ref() {
-                    self.handle_select_all_tool(selection, &songs[..]);
-                }
-            }
-            _ => self.default_handle_tool_activated(selection, tool),
-        };
+    fn select_all(&self) {
+        if let Some(songs) = self.songs_ref() {
+            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
+            self.dispatcher
+                .dispatch(SelectionAction::Select(songs).into());
+        }
     }
 }
diff --git a/src/app/components/details/album_header.css b/src/app/components/details/album_header.css
new file mode 100644
index 00000000..4b209498
--- /dev/null
+++ b/src/app/components/details/album_header.css
@@ -0,0 +1,56 @@
+.album__header .title-4 label, .header__mobile .title-4 label {
+  color: @window_fg_color;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+.album__header .title-4, .header__mobile .title-4 {
+  padding: 0;
+}
+
+
+.album__header .title-4:hover, .header__mobile .title-4:hover {
+  border-radius: 6px;
+  background-image: image(alpha(currentColor, 0.08));
+}
+
+.album__header .like__button {
+  margin-right: 6px;
+}
+
+.album__header .vertical {
+  margin-left: 18px;
+}
+
+.album__header .card {
+  margin-top: 18px;
+  margin-left: 6px;
+  margin-bottom: 6px;
+}
+
+.header__mobile .card {
+  margin-top: 12px;
+}
+clamp.details__clamp {
+  background-color: @view_bg_color;
+  box-shadow: inset 0px -1px 0px @borders;
+}
+
+headerbar.details__headerbar {
+  box-shadow: none;
+  transition: background-color .3s ease;
+}
+
+headerbar.flat.details__headerbar windowtitle {
+  opacity: 0;
+}
+
+headerbar.details__headerbar windowtitle {
+  transition: opacity .3s ease;
+  opacity: 1;
+}
+
+.details__headerbar.flat {
+  background-color: @view_bg_color;
+}
+
diff --git a/src/app/components/details/album_header.rs b/src/app/components/details/album_header.rs
new file mode 100644
index 00000000..cf74daf4
--- /dev/null
+++ b/src/app/components/details/album_header.rs
@@ -0,0 +1,130 @@
+use crate::app::components::display_add_css_provider;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::{glib, CompositeTemplate};
+
+mod imp {
+
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/dev/alextren/Spot/components/album_header.ui")]
+    pub struct AlbumHeaderWidget {
+        #[template_child]
+        pub album_label: TemplateChild<gtk::Label>,
+
+        #[template_child]
+        pub album_art: TemplateChild<gtk::Image>,
+
+        #[template_child]
+        pub like_button: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub info_button: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub album_info: TemplateChild<gtk::Box>,
+
+        #[template_child]
+        pub artist_button: TemplateChild<gtk::LinkButton>,
+
+        #[template_child]
+        pub artist_button_label: TemplateChild<gtk::Label>,
+
+        #[template_child]
+        pub year_label: TemplateChild<gtk::Label>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for AlbumHeaderWidget {
+        const NAME: &'static str = "AlbumHeaderWidget";
+        type Type = super::AlbumHeaderWidget;
+        type ParentType = gtk::Box;
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            display_add_css_provider(resource!("/components/album_header.css"));
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for AlbumHeaderWidget {}
+    impl WidgetImpl for AlbumHeaderWidget {}
+    impl BoxImpl for AlbumHeaderWidget {}
+}
+
+glib::wrapper! {
+    pub struct AlbumHeaderWidget(ObjectSubclass<imp::AlbumHeaderWidget>) @extends gtk::Widget, gtk::Box;
+}
+
+impl AlbumHeaderWidget {
+    pub fn new() -> Self {
+        glib::Object::new(&[]).expect("Failed to create an instance of AlbumHeaderWidget")
+    }
+
+    pub fn widget(&self) -> &imp::AlbumHeaderWidget {
+        imp::AlbumHeaderWidget::from_instance(self)
+    }
+
+    pub fn connect_liked<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().like_button.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_info<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().info_button.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_artist_clicked<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().artist_button.connect_activate_link(move |_| {
+            f();
+            glib::signal::Inhibit(true)
+        });
+    }
+
+    pub fn set_liked(&self, is_liked: bool) {
+        self.widget().like_button.set_icon_name(if is_liked {
+            "starred-symbolic"
+        } else {
+            "non-starred-symbolic"
+        });
+    }
+
+    pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
+        self.widget().album_art.set_from_pixbuf(Some(art));
+    }
+
+    pub fn set_album_and_artist_and_year(&self, album: &str, artist: &str, year: Option<u32>) {
+        let widget = self.widget();
+        widget.album_label.set_label(album);
+        widget.artist_button_label.set_label(artist);
+        match year {
+            Some(year) => widget.year_label.set_label(&year.to_string()),
+            None => widget.year_label.hide(),
+        }
+    }
+
+    pub fn set_centered(&self) {
+        let widget = self.widget();
+        widget.album_label.set_halign(gtk::Align::Center);
+        widget.album_label.set_justify(gtk::Justification::Center);
+        widget.artist_button.set_halign(gtk::Align::Center);
+        widget.year_label.set_halign(gtk::Align::Center);
+    }
+
+    pub fn hide_actions(&self) {
+        self.widget().like_button.set_visible(false);
+        self.widget().info_button.set_visible(false);
+    }
+}
diff --git a/src/app/components/details/album_header.ui b/src/app/components/details/album_header.ui
new file mode 100644
index 00000000..b23f3f9c
--- /dev/null
+++ b/src/app/components/details/album_header.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="AlbumHeaderWidget" parent="GtkBox">
+    <property name="valign">start</property>
+    <property name="vexpand">0</property>
+    <property name="margin-start">6</property>
+    <property name="margin-end">6</property>
+    <property name="margin-bottom">6</property>
+    <child>
+      <object class="GtkOverlay">
+      <property name="overflow">hidden</property>
+      <property name="halign">center</property>
+        <child>
+          <object class="GtkImage" id="album_art">
+            <property name="width-request">160</property>
+            <property name="height-request">160</property>
+            <property name="icon-name">emblem-music-symbolic</property>
+          </object>
+        </child>
+        <child type="overlay">
+          <object class="GtkButton" id="info_button">
+            <property name="icon-name">preferences-system-details-symbolic</property>
+            <property name="halign">end</property>
+            <property name="valign">end</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
+            <property name="tooltip-text">Album Info</property>
+            <style>
+              <class name="circular" />
+              <class name="osd" />
+            </style>
+          </object>
+        </child>
+        <style>
+          <class name="card"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="album_info">
+        <property name="hexpand">1</property>
+        <property name="valign">center</property>
+        <property name="orientation">vertical</property>
+				<property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="album_label">
+            <property name="xalign">0</property>
+            <property name="halign">start</property>
+            <property name="label">Album</property>
+            <property name="wrap">1</property>
+            <property name="ellipsize">end</property>
+            <property name="max-width-chars">50</property>
+            <property name="lines">4</property>
+            <style>
+              <class name="title-1" />
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLinkButton" id="artist_button">
+            <property name="receives-default">1</property>
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="has-frame">0</property>
+            <child>
+              <object class="GtkLabel" id="artist_button_label">
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="label">Artist</property>
+                <property name="ellipsize">middle</property>
+              </object>
+            </child>
+            <style>
+              <class name="title-4" />
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="year_label">
+            <property name="xalign">0</property>
+            <property name="halign">start</property>
+            <property name="label">Year</property>
+            <property name="ellipsize">end</property>
+            <property name="max-width-chars">50</property>
+            <property name="lines">1</property>
+            <property name="sensitive">0</property>
+            <style>
+              <class name="body"/>
+            </style>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="like_button">
+        <property name="receives-default">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="tooltip-text">Add to Library</property>
+        <style>
+          <class name="circular" />
+          <class name="like__button" />
+        </style>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/app/components/details/details.css b/src/app/components/details/details.css
deleted file mode 100644
index 90e44b42..00000000
--- a/src/app/components/details/details.css
+++ /dev/null
@@ -1,44 +0,0 @@
-label.details__album-label {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-.details__more label {
-  font-size: 16px;
-  color: @theme_text_color;
-}
-
-.details .details__album-art {
-  border-radius: 8px;
-}
-
-.details .details__like {
-  font-size: 18px;
-  font-weight: bold;
-}
-
-.details__more {
-  padding: 0;
-}
-
-.details {
-  transition: opacity 0.3s ease;
-  opacity: 0;
-}
-
-.details--loaded {
-  opacity: 1;
-}
-
-listview.details__songs {
-  padding: 4px;
-  border-radius: 8px;
-}
-
-listview.details__songs row {
-  border-radius: 4px;
-}
-
-.info_btn {
-  padding: 0;
-}
\ No newline at end of file
diff --git a/src/app/components/details/details.rs b/src/app/components/details/details.rs
index 82b55ec4..9dca0b13 100644
--- a/src/app/components/details/details.rs
+++ b/src/app/components/details/details.rs
@@ -3,16 +3,21 @@ use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use std::rc::Rc;
 
+use super::album_header::AlbumHeaderWidget;
 use super::release_details::ReleaseDetailsWindow;
 use super::DetailsModel;
 
-use crate::app::components::{display_add_css_provider, Component, EventListener, Playlist};
+use crate::app::components::{
+    Component, EventListener, HeaderBarComponent, HeaderBarWidget, Playlist,
+};
 use crate::app::dispatch::Worker;
 use crate::app::loader::ImageLoader;
 use crate::app::{AppEvent, BrowserEvent};
 
 mod imp {
 
+    use libadwaita::subclass::prelude::BinImpl;
+
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate)]
@@ -22,35 +27,26 @@ mod imp {
         pub scrolled_window: TemplateChild<gtk::ScrolledWindow>,
 
         #[template_child]
-        pub header_revealer: TemplateChild<gtk::Revealer>,
-
-        #[template_child]
-        pub album_label: TemplateChild<gtk::Label>,
-
-        #[template_child]
-        pub album_tracks: TemplateChild<gtk::ListView>,
-
-        #[template_child]
-        pub album_art: TemplateChild<gtk::Image>,
+        pub headerbar: TemplateChild<HeaderBarWidget>,
 
         #[template_child]
-        pub like_button: TemplateChild<gtk::Button>,
+        pub header_revealer: TemplateChild<gtk::Revealer>,
 
         #[template_child]
-        pub info_button: TemplateChild<gtk::Button>,
+        pub header_widget: TemplateChild<AlbumHeaderWidget>,
 
         #[template_child]
-        pub artist_button: TemplateChild<gtk::LinkButton>,
+        pub header_mobile: TemplateChild<AlbumHeaderWidget>,
 
         #[template_child]
-        pub artist_button_label: TemplateChild<gtk::Label>,
+        pub album_tracks: TemplateChild<gtk::ListView>,
     }
 
     #[glib::object_subclass]
     impl ObjectSubclass for AlbumDetailsWidget {
         const NAME: &'static str = "AlbumDetailsWidget";
         type Type = super::AlbumDetailsWidget;
-        type ParentType = gtk::Box;
+        type ParentType = libadwaita::Bin;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -61,18 +57,24 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for AlbumDetailsWidget {}
+    impl ObjectImpl for AlbumDetailsWidget {
+        fn constructed(&self, obj: &Self::Type) {
+            self.parent_constructed(obj);
+            self.header_mobile.set_centered();
+            self.headerbar.add_classes(&["details__headerbar"]);
+        }
+    }
+
     impl WidgetImpl for AlbumDetailsWidget {}
-    impl BoxImpl for AlbumDetailsWidget {}
+    impl BinImpl for AlbumDetailsWidget {}
 }
 
 glib::wrapper! {
-    pub struct AlbumDetailsWidget(ObjectSubclass<imp::AlbumDetailsWidget>) @extends gtk::Widget, gtk::Box;
+    pub struct AlbumDetailsWidget(ObjectSubclass<imp::AlbumDetailsWidget>) @extends gtk::Widget, libadwaita::Bin;
 }
 
 impl AlbumDetailsWidget {
     fn new() -> Self {
-        display_add_css_provider(resource!("/components/details.css"));
         glib::Object::new(&[]).expect("Failed to create an instance of AlbumDetailsWidget")
     }
 
@@ -85,23 +87,40 @@ impl AlbumDetailsWidget {
         let is_up_to_date = widget.header_revealer.reveals_child() == visible;
         if !is_up_to_date {
             widget.header_revealer.set_reveal_child(visible);
+            widget.headerbar.set_title_visible(true);
+            if visible {
+                widget.headerbar.add_classes(&["flat"]);
+            } else {
+                widget.headerbar.remove_classes(&["flat"]);
+            }
         }
         is_up_to_date
     }
 
-    fn connect_header(&self) {
+    fn connect_header_visibility(&self) {
         self.set_header_visible(true);
 
         let scroll_controller =
             gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL);
         scroll_controller.connect_scroll(
             clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, _, dy| {
-                gtk::Inhibit(!_self.set_header_visible(dy < 0f64))
+                let visible = dy < 0f64;
+                gtk::Inhibit(!_self.set_header_visible(visible))
             }),
         );
 
-        let widget = self.widget();
-        widget.scrolled_window.add_controller(&scroll_controller);
+        let swipe_controller = gtk::GestureSwipe::new();
+        swipe_controller.set_touch_only(true);
+        swipe_controller.set_propagation_phase(gtk::PropagationPhase::Capture);
+        swipe_controller.connect_swipe(clone!(@weak self as _self => move |_, _, dy| {
+            let visible = dy >= 0f64;
+            _self.set_header_visible(visible);
+        }));
+
+        self.widget()
+            .scrolled_window
+            .add_controller(&scroll_controller);
+        self.add_controller(&swipe_controller);
     }
 
     fn connect_bottom_edge<F>(&self, f: F)
@@ -117,53 +136,65 @@ impl AlbumDetailsWidget {
             });
     }
 
-    fn connect_liked<F>(&self, f: F)
-    where
-        F: Fn() + 'static,
-    {
-        self.widget().like_button.connect_clicked(move |_| f());
+    fn headerbar_widget(&self) -> &HeaderBarWidget {
+        self.widget().headerbar.as_ref()
     }
 
-    fn connect_info<F>(&self, f: F)
-    where
-        F: Fn() + 'static,
-    {
-        self.widget().info_button.connect_clicked(move |_| f());
+    fn album_tracks_widget(&self) -> &gtk::ListView {
+        self.widget().album_tracks.as_ref()
     }
 
-    fn connect_artist_clicked<F>(&self, f: F)
+    fn set_loaded(&self) {
+        let context = self.style_context();
+        context.add_class("container--loaded");
+    }
+
+    fn connect_liked<F>(&self, f: F)
     where
-        F: Fn() + 'static,
+        F: Fn() + Clone + 'static,
     {
-        self.widget().artist_button.connect_activate_link(move |_| {
-            f();
-            glib::signal::Inhibit(true)
-        });
+        self.widget().header_widget.connect_liked(f.clone());
+        self.widget().header_mobile.connect_liked(f);
     }
 
-    fn album_tracks_widget(&self) -> &gtk::ListView {
-        self.widget().album_tracks.as_ref()
+    fn connect_info<F>(&self, f: F)
+    where
+        F: Fn() + Clone + 'static,
+    {
+        self.widget().header_widget.connect_info(f.clone());
+        self.widget().header_mobile.connect_info(f);
     }
 
     fn set_liked(&self, is_liked: bool) {
-        self.widget()
-            .like_button
-            .set_label(if is_liked { "♥" } else { "♡" });
+        self.widget().header_widget.set_liked(is_liked);
+        self.widget().header_mobile.set_liked(is_liked);
     }
 
-    fn set_loaded(&self) {
-        let context = self.style_context();
-        context.add_class("details--loaded");
+    fn set_album_and_artist_and_year(&self, album: &str, artist: &str, year: Option<u32>) {
+        self.widget()
+            .header_widget
+            .set_album_and_artist_and_year(album, artist, year);
+        self.widget()
+            .header_mobile
+            .set_album_and_artist_and_year(album, artist, year);
+        self.widget()
+            .headerbar
+            .set_title_and_subtitle(album, artist);
     }
 
-    pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
-        self.widget().album_art.set_from_pixbuf(Some(art));
+    fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
+        self.widget().header_widget.set_artwork(art);
+        self.widget().header_mobile.set_artwork(art);
     }
 
-    fn set_album_and_artist(&self, album: &str, artist: &str) {
-        let widget = self.widget();
-        widget.album_label.set_label(album);
-        widget.artist_button_label.set_label(artist);
+    fn connect_artist_clicked<F>(&self, f: F)
+    where
+        F: Fn() + Clone + 'static,
+    {
+        self.widget()
+            .header_widget
+            .connect_artist_clicked(f.clone());
+        self.widget().header_mobile.connect_artist_clicked(f);
     }
 }
 
@@ -182,16 +213,25 @@ impl Details {
         }
 
         let widget = AlbumDetailsWidget::new();
+
         let playlist = Box::new(Playlist::new(
             widget.album_tracks_widget().clone(),
             model.clone(),
+            worker.clone(),
+            false,
+        ));
+
+        let headerbar_widget = widget.headerbar_widget();
+        let headerbar = Box::new(HeaderBarComponent::new(
+            headerbar_widget.clone(),
+            model.to_headerbar_model(),
         ));
 
         let modal = ReleaseDetailsWindow::new();
 
         widget.connect_liked(clone!(@weak model => move || model.toggle_save_album()));
 
-        widget.connect_header();
+        widget.connect_header_visibility();
 
         widget.connect_bottom_edge(clone!(@weak model => move || {
             model.load_more();
@@ -214,7 +254,7 @@ impl Details {
             worker,
             widget,
             modal,
-            children: vec![playlist],
+            children: vec![playlist, headerbar],
         }
     }
 
@@ -222,6 +262,7 @@ impl Details {
         if let Some(info) = self.model.get_album_info() {
             let is_liked = info.description.is_liked;
             self.widget.set_liked(is_liked);
+            self.widget.set_liked(is_liked);
         }
     }
 
@@ -231,18 +272,22 @@ impl Details {
             let album = &album.description;
 
             self.widget.set_liked(album.is_liked);
-            self.widget
-                .set_album_and_artist(&album.title[..], &album.artists_name());
-            self.widget
-                .connect_artist_clicked(clone!(@weak self.model as model => move || {
-                    model.view_artist();
-                }));
+
+            self.widget.set_album_and_artist_and_year(
+                &album.title[..],
+                &album.artists_name(),
+                album.year(),
+            );
+
+            self.widget.connect_artist_clicked(
+                clone!(@weak self.model as model => move || model.view_artist()),
+            );
 
             self.modal.set_details(
                 &album.title,
                 &album.artists_name(),
                 &details.label,
-                &details.release_date,
+                album.release_date.as_ref().unwrap(),
                 album.songs.len(),
                 &album.formatted_time(),
                 &details.copyright_text,
@@ -250,18 +295,14 @@ impl Details {
 
             if let Some(art) = album.art.clone() {
                 let widget = self.widget.downgrade();
-                let modal = self.modal.downgrade();
 
                 self.worker.send_local_task(async move {
                     let pixbuf = ImageLoader::new()
-                        .load_remote(&art[..], "jpg", 200, 200)
+                        .load_remote(&art[..], "jpg", 320, 320)
                         .await;
-                    if let (Some(widget), Some(modal), Some(ref pixbuf)) =
-                        (widget.upgrade(), modal.upgrade(), pixbuf)
-                    {
+                    if let (Some(widget), Some(ref pixbuf)) = (widget.upgrade(), pixbuf) {
                         widget.set_artwork(pixbuf);
                         widget.set_loaded();
-                        modal.set_artwork(pixbuf);
                     }
                 });
             } else {
diff --git a/src/app/components/details/details.ui b/src/app/components/details/details.ui
index eb31761b..02e92dad 100644
--- a/src/app/components/details/details.ui
+++ b/src/app/components/details/details.ui
@@ -1,134 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <template class="AlbumDetailsWidget" parent="GtkBox">
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="AlbumDetailsWidget" parent="AdwBin">
     <child>
-      <object class="AdwClamp">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
         <property name="vexpand">1</property>
         <property name="hexpand">1</property>
-        <property name="maximum-size">900</property>
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
-        <property name="margin-top">8</property>
-        <property name="margin-bottom">8</property>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="vexpand">1</property>
-            <property name="hexpand">1</property>
-            <property name="spacing">8</property>
+          <object class="HeaderBarWidget" id="headerbar"></object>
+        </child>
+        <child>
+          <object class="GtkWindowHandle">
             <child>
-              <object class="GtkRevealer" id="header_revealer">
-                <property name="transition-type">slide-down</property>
+              <object class="AdwClamp">
+                <property name="maximum-size">900</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="valign">start</property>
-                    <property name="spacing">16</property>
-                    <property name="vexpand">0</property>
+                  <object class="GtkRevealer" id="header_revealer">
+                    <property name="transition-type">slide-up</property>
                     <child>
-                      <object class="GtkOverlay">
-                        <child>
-                          <object class="GtkImage" id="album_art">
-                            <property name="width-request">100</property>
-                            <property name="height-request">100</property>
-                            <property name="icon-name">emblem-music-symbolic</property>
-                            <style>
-                              <class name="details__album-art"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child type="overlay">
-                          <object class="GtkButton" id="info_button">
-                            <property name="width-request">32</property>
-                            <property name="height-request">32</property>
-                            <property name="icon-name">preferences-system-details-symbolic</property>
-                            <property name="halign">end</property>
-                            <property name="valign">end</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-end">5</property>
-                            <property name="margin-top">5</property>
-                            <property name="margin-bottom">5</property>
-                            <property name="has-frame">1</property>
-                            <style>
-                              <class name="circular"/>
-                              <class name="osd"/>
-                              <class name="info_btn"/>
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="hexpand">1</property>
+                      <object class="AdwSqueezer">
+                        <property name="switch-threshold-policy">natural</property>
                         <property name="valign">center</property>
-                        <property name="orientation">vertical</property>
+                        <property name="homogeneous">0</property>
+                        <property name="transition-type">crossfade</property>
                         <child>
-                          <object class="GtkLabel" id="album_label">
-                            <property name="halign">start</property>
-                            <property name="label">Album</property>
-                            <property name="wrap">1</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max-width-chars">50</property>
-                            <property name="lines">4</property>
-                            <property name="xalign">0</property>
+                          <object class="AlbumHeaderWidget" id="header_widget">
                             <style>
-                              <class name="details__album-label"/>
+                              <class name="album__header" />
                             </style>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLinkButton" id="artist_button">
-                            <property name="receives-default">1</property>
-                            <property name="halign">start</property>
-                            <property name="valign">center</property>
-                            <property name="has-frame">0</property>
-                            <child>
-                              <object class="GtkLabel" id="artist_button_label">
-                                <property name="hexpand">1</property>
-                                <property name="vexpand">1</property>
-                                <property name="label">Artist</property>
-                                <property name="ellipsize">middle</property>
-                                <property name="xalign">0</property>
-                              </object>
-                            </child>
+                          <object class="AlbumHeaderWidget" id="header_mobile">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
                             <style>
-                              <class name="details__more"/>
+                              <class name="header__mobile" />
                             </style>
                           </object>
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="like_button">
-                        <property name="label">♥</property>
-                        <property name="width-request">35</property>
-                        <property name="height-request">35</property>
-                        <property name="receives-default">1</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <style>
-                          <class name="circular"/>
-                          <class name="details__like"/>
-                        </style>
-                      </object>
-                    </child>
                   </object>
                 </child>
+                <style>
+                  <class name="details__clamp" />
+                </style>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolled_window">
+            <property name="hscrollbar-policy">never</property>
+            <property name="propagate-natural-width">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="hscrollbar-policy">never</property>
-                <property name="propagate-natural-width">1</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
+              <object class="AdwClampScrollable">
+                <property name="maximum-size">900</property>
                 <child>
                   <object class="GtkListView" id="album_tracks">
-                    <property name="valign">start</property>
                     <style>
-                      <class name="details__songs"/>
+                      <class name="album__tracks" />
                     </style>
                   </object>
                 </child>
@@ -139,7 +75,7 @@
       </object>
     </child>
     <style>
-      <class name="details"/>
+      <class name="container" />
     </style>
   </template>
 </interface>
diff --git a/src/app/components/details/details_model.rs b/src/app/components/details/details_model.rs
index d386f859..29c89f8b 100644
--- a/src/app/components/details/details_model.rs
+++ b/src/app/components/details/details_model.rs
@@ -3,15 +3,15 @@ use gio::SimpleActionGroup;
 use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use crate::api::SpotifyApiClient;
+use crate::app::components::labels;
+use crate::app::components::HeaderBarModel;
 use crate::app::components::PlaylistModel;
-use crate::app::components::{
-    labels, AddSelectionTool, SelectionTool, SelectionToolsModel, SimpleSelectionTool,
-};
+use crate::app::components::SimpleHeaderBarModel;
+use crate::app::components::SimpleHeaderBarModelWrapper;
 use crate::app::dispatch::ActionDispatcher;
 use crate::app::models::*;
+use crate::app::state::SelectionContext;
 use crate::app::state::{
     BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
 };
@@ -32,6 +32,10 @@ impl DetailsModel {
         }
     }
 
+    fn state(&self) -> Ref<'_, AppState> {
+        self.app_model.get_state()
+    }
+
     fn songs_ref(&self) -> Option<impl Deref<Target = SongList> + '_> {
         self.app_model.map_state_opt(|s| {
             Some(
@@ -125,11 +129,13 @@ impl DetailsModel {
 
         Some(())
     }
-}
 
-impl DetailsModel {
-    fn state(&self) -> Ref<'_, AppState> {
-        self.app_model.get_state()
+    pub fn to_headerbar_model(self: &Rc<Self>) -> Rc<impl HeaderBarModel> {
+        Rc::new(SimpleHeaderBarModelWrapper::new(
+            self.clone(),
+            self.app_model.clone(),
+            self.dispatcher.box_clone(),
+        ))
     }
 }
 
@@ -149,7 +155,7 @@ impl PlaylistModel for DetailsModel {
 
     fn enable_selection(&self) -> bool {
         self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(true));
+            .dispatch(AppAction::EnableSelection(SelectionContext::Default));
         true
     }
 
@@ -212,11 +218,7 @@ impl PlaylistModel for DetailsModel {
         let menu = gio::Menu::new();
         for artist in song.artists.iter() {
             menu.append(
-                Some(&format!(
-                    "{} {}",
-                    *labels::MORE_FROM,
-                    glib::markup_escape_text(&artist.name)
-                )),
+                Some(&labels::more_from_label(&artist.name)),
                 Some(&format!("song.view_artist_{}", artist.id)),
             );
         }
@@ -227,45 +229,24 @@ impl PlaylistModel for DetailsModel {
     }
 }
 
-impl SelectionToolsModel for DetailsModel {
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher> {
-        self.dispatcher.box_clone()
+impl SimpleHeaderBarModel for DetailsModel {
+    fn title(&self) -> Option<String> {
+        None
     }
 
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync> {
-        self.app_model.get_spotify()
+    fn title_updated(&self, _: &AppEvent) -> bool {
+        false
     }
 
-    fn tools_visible(&self, _: &SelectionState) -> Vec<SelectionTool> {
-        let mut playlists: Vec<SelectionTool> = self
-            .app_model
-            .get_state()
-            .logged_user
-            .playlists
-            .iter()
-            .map(|p| SelectionTool::Add(AddSelectionTool::AddToPlaylist(p.clone())))
-            .collect();
-        let mut tools = vec![
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll),
-            SelectionTool::Add(AddSelectionTool::AddToQueue),
-        ];
-        tools.append(&mut playlists);
-        tools
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        Some(&SelectionContext::Default)
     }
 
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        Some(Box::new(self.app_model.map_state(|s| &s.selection)))
-    }
-
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll) => {
-                if let Some(songs) = self.songs_ref() {
-                    let vec = songs.iter().collect::<Vec<&SongDescription>>();
-                    self.handle_select_all_tool_borrowed(selection, &vec[..]);
-                }
-            }
-            _ => self.default_handle_tool_activated(selection, tool),
-        };
+    fn select_all(&self) {
+        if let Some(songs) = self.songs_ref() {
+            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
+            self.dispatcher
+                .dispatch(SelectionAction::Select(songs).into());
+        }
     }
 }
diff --git a/src/app/components/details/mod.rs b/src/app/components/details/mod.rs
index 2d367f88..ae36dd5a 100644
--- a/src/app/components/details/mod.rs
+++ b/src/app/components/details/mod.rs
@@ -1,7 +1,8 @@
+mod album_header;
 mod details;
 mod details_model;
 
+pub use album_header::AlbumHeaderWidget;
 pub use details::Details;
 pub use details_model::DetailsModel;
-
 mod release_details;
diff --git a/src/app/components/details/release_details.rs b/src/app/components/details/release_details.rs
index a3d8db30..fd46d752 100644
--- a/src/app/components/details/release_details.rs
+++ b/src/app/components/details/release_details.rs
@@ -1,9 +1,10 @@
-use gettextrs::gettext;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use libadwaita::subclass::prelude::*;
 
+use crate::app::components::labels;
+
 mod imp {
 
     use super::*;
@@ -12,13 +13,7 @@ mod imp {
     #[template(resource = "/dev/alextren/Spot/components/release_details.ui")]
     pub struct ReleaseDetailsWindow {
         #[template_child]
-        pub close: TemplateChild<gtk::Button>,
-
-        #[template_child]
-        pub art: TemplateChild<gtk::Image>,
-
-        #[template_child]
-        pub album_artist: TemplateChild<gtk::Label>,
+        pub album_artist: TemplateChild<libadwaita::WindowTitle>,
 
         #[template_child]
         pub label: TemplateChild<gtk::Label>,
@@ -54,8 +49,6 @@ mod imp {
     impl ObjectImpl for ReleaseDetailsWindow {
         fn constructed(&self, obj: &Self::Type) {
             self.parent_constructed(obj);
-            self.close
-                .connect_clicked(clone!(@weak obj => move |_| obj.hide()));
         }
     }
 
@@ -65,7 +58,7 @@ mod imp {
 }
 
 glib::wrapper! {
-    pub struct ReleaseDetailsWindow(ObjectSubclass<imp::ReleaseDetailsWindow>) @extends gtk::Widget, libadwaita::Window;
+    pub struct ReleaseDetailsWindow(ObjectSubclass<imp::ReleaseDetailsWindow>) @extends gtk::Widget, libadwaita::Window, libadwaita::PreferencesWindow;
 }
 
 impl ReleaseDetailsWindow {
@@ -77,10 +70,6 @@ impl ReleaseDetailsWindow {
         imp::ReleaseDetailsWindow::from_instance(self)
     }
 
-    pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
-        self.widget().art.set_from_pixbuf(Some(art));
-    }
-
     #[allow(clippy::too_many_arguments)]
     pub fn set_details(
         &self,
@@ -94,47 +83,14 @@ impl ReleaseDetailsWindow {
     ) {
         let widget = self.widget();
 
-        widget.album_artist.set_text(&format!(
-            "{} {} {}",
-            album,
-            // translators: This is part of a larger label that reads "<Album> by <Artist>"
-            gettext("by"),
-            artist
-        ));
-
-        widget.label.set_text(&format!(
-            "{} {}",
-            // translators: This refers to a music label
-            gettext("Label:"),
-            label
-        ));
-
-        widget.release.set_text(&format!(
-            "{} {}",
-            // translators: This refers to a release date
-            gettext("Released:"),
-            release_date
-        ));
-
-        widget.tracks.set_text(&format!(
-            "{} {}",
-            // translators: This refers to a number of tracks
-            gettext("Tracks:"),
-            track_count
-        ));
-
-        widget.duration.set_text(&format!(
-            "{} {}",
-            // translators: This refers to the duration of eg. an album
-            gettext("Duration:"),
-            duration
-        ));
-
-        widget.copyright.set_text(&format!(
-            "{} {}",
-            // translators: Self explanatory
-            gettext("Copyright:"),
-            copyright
-        ));
+        widget
+            .album_artist
+            .set_title(&labels::album_by_artist_label(album, artist));
+
+        widget.label.set_text(label);
+        widget.release.set_text(release_date);
+        widget.tracks.set_text(&track_count.to_string());
+        widget.duration.set_text(duration);
+        widget.copyright.set_text(copyright);
     }
 }
diff --git a/src/app/components/details/release_details.ui b/src/app/components/details/release_details.ui
index c12ebca0..00745763 100644
--- a/src/app/components/details/release_details.ui
+++ b/src/app/components/details/release_details.ui
@@ -1,129 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
   <template class="ReleaseDetailsWindow" parent="AdwWindow">
-    <property name="can-focus">0</property>
     <property name="modal">1</property>
-    <property name="default-width">250</property>
+    <property name="hide-on-close">1</property>
+    <property name="default-width">360</property>
     <child>
-      <object class="GtkWindowHandle">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
+          <object class="AdwHeaderBar">
+            <property name="show-end-title-buttons">1</property>
+            <child type="title">
+              <object class="AdwWindowTitle" id="album_artist" />
+            </child>
+            <style>
+              <class name="flat" />
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkListBox">
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
+            <property name="valign">start</property>
+            <property name="selection-mode">none</property>
+            <property name="show-separators">1</property>
+            <property name="overflow">hidden</property>
+            <style>
+              <class name="card" />
+            </style>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes" comments="This refers to a music label">Label</property>
+                <child type="suffix">
+                  <object class="GtkLabel" id="label">
+                    <property name="label">Label</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes" comments="This refers to a release date">Released</property>
+                <child type="suffix">
+                  <object class="GtkLabel" id="release">
+                    <property name="label">Released</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes" comments="This refers to a number of tracks">Tracks</property>
+                <child type="suffix">
+                  <object class="GtkLabel" id="tracks">
+                    <property name="label">Tracks</property>
+                  </object>
+                </child>
+              </object>
+            </child>
             <child>
-              <object class="GtkButton" id="close">
-                <property name="valign">center</property>
-                <property name="receives-default">1</property>
-                <property name="halign">end</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">5</property>
-                <property name="margin-bottom">5</property>
-                <property name="has-frame">0</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="width-request">22</property>
-                    <property name="height-request">22</property>
-                    <property name="icon-name">window-close-symbolic</property>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes" comments="This refers to the duration of a release">Duration</property>
+                <child type="suffix">
+                  <object class="GtkLabel" id="duration">
+                    <property name="label">Duration</property>
                   </object>
                 </child>
-                <style>
-                  <class name="circular"/>
-                </style>
               </object>
             </child>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="vexpand">1</property>
-                <property name="propagate-natural-height">1</property>
-                <child>
-                  <object class="AdwClamp">
-                    <property name="maximum-size">900</property>
-                    <property name="tightening-threshold">360</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="margin-start">10</property>
-                        <property name="margin-end">10</property>
-                        <property name="margin-top">5</property>
-                        <property name="margin-bottom">10</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkImage" id="art">
-                            <property name="width-request">200</property>
-                            <property name="height-request">200</property>
-                            <property name="can-focus">0</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <property name="icon-name">emblem-music-symbolic</property>
-                            <style>
-                              <class name="details__album-art"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="margin-top">10</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">1</property>
-                            <child>
-                              <object class="GtkLabel" id="album_artist">
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="label">Album by Artist</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                                <style>
-                                  <class name="details__album-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label">
-                                <property name="margin-top">5</property>
-                                <property name="label">Label</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="release">
-                                <property name="label">Release Date</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="tracks">
-                                <property name="label">Tracks</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="duration">
-                                <property name="label">Duration</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="copyright">
-                                <property name="label">Copyright</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">1</property>
-                                <property name="wrap-mode">word-char</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">Copyright</property>
+                <child type="suffix">
+                  <object class="GtkLabel" id="copyright">
+                    <property name="label">Copyright</property>
+                    <property name="ellipsize">middle</property>
                   </object>
                 </child>
               </object>
@@ -133,4 +89,4 @@
       </object>
     </child>
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/src/app/components/headerbar/component.rs b/src/app/components/headerbar/component.rs
new file mode 100644
index 00000000..4f6e2912
--- /dev/null
+++ b/src/app/components/headerbar/component.rs
@@ -0,0 +1,291 @@
+use std::rc::Rc;
+
+use glib::Cast;
+use gtk::prelude::*;
+
+use crate::app::{
+    components::{Component, EventListener, ListenerComponent},
+    state::{SelectionContext, SelectionEvent},
+    ActionDispatcher, AppAction, AppEvent, AppModel, BrowserAction, BrowserEvent,
+};
+
+use super::widget::HeaderBarWidget;
+
+pub trait HeaderBarModel {
+    fn title(&self) -> Option<String>;
+    fn title_updated(&self, event: &AppEvent) -> bool;
+    fn go_back(&self);
+    fn can_go_back(&self) -> bool;
+    fn selection_context(&self) -> Option<&SelectionContext>;
+    fn can_select_all(&self) -> bool;
+    fn start_selection(&self);
+    fn select_all(&self);
+    fn cancel_selection(&self);
+    fn selected_count(&self) -> usize;
+}
+
+pub struct DefaultHeaderBarModel {
+    title: Option<String>,
+    selection_context: Option<SelectionContext>,
+    app_model: Rc<AppModel>,
+    dispatcher: Box<dyn ActionDispatcher>,
+}
+
+impl DefaultHeaderBarModel {
+    pub fn new(
+        title: Option<String>,
+        selection_context: Option<SelectionContext>,
+        app_model: Rc<AppModel>,
+        dispatcher: Box<dyn ActionDispatcher>,
+    ) -> Self {
+        Self {
+            title,
+            selection_context,
+            app_model,
+            dispatcher,
+        }
+    }
+}
+
+impl HeaderBarModel for DefaultHeaderBarModel {
+    fn title(&self) -> Option<String> {
+        self.title.clone()
+    }
+
+    fn title_updated(&self, _: &AppEvent) -> bool {
+        false
+    }
+
+    fn go_back(&self) {
+        self.dispatcher
+            .dispatch(BrowserAction::NavigationPop.into())
+    }
+
+    fn can_go_back(&self) -> bool {
+        self.app_model.get_state().browser.can_pop()
+    }
+
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        self.selection_context.as_ref()
+    }
+
+    fn can_select_all(&self) -> bool {
+        false
+    }
+
+    fn start_selection(&self) {
+        if let Some(context) = self.selection_context.as_ref() {
+            self.dispatcher
+                .dispatch(AppAction::EnableSelection(context.clone()))
+        }
+    }
+
+    fn select_all(&self) {}
+
+    fn cancel_selection(&self) {
+        self.dispatcher.dispatch(AppAction::CancelSelection)
+    }
+
+    fn selected_count(&self) -> usize {
+        self.app_model.get_state().selection.count()
+    }
+}
+
+pub trait SimpleHeaderBarModel {
+    fn title(&self) -> Option<String>;
+    fn title_updated(&self, event: &AppEvent) -> bool;
+    fn selection_context(&self) -> Option<&SelectionContext>;
+    fn select_all(&self);
+}
+
+pub struct SimpleHeaderBarModelWrapper<M> {
+    wrapped_model: Rc<M>,
+    app_model: Rc<AppModel>,
+    dispatcher: Box<dyn ActionDispatcher>,
+}
+
+impl<M> SimpleHeaderBarModelWrapper<M> {
+    pub fn new(
+        wrapped_model: Rc<M>,
+        app_model: Rc<AppModel>,
+        dispatcher: Box<dyn ActionDispatcher>,
+    ) -> Self {
+        Self {
+            wrapped_model,
+            app_model,
+            dispatcher,
+        }
+    }
+}
+
+impl<M> HeaderBarModel for SimpleHeaderBarModelWrapper<M>
+where
+    M: SimpleHeaderBarModel + 'static,
+{
+    fn title(&self) -> Option<String> {
+        self.wrapped_model.title()
+    }
+
+    fn title_updated(&self, event: &AppEvent) -> bool {
+        self.wrapped_model.title_updated(event)
+    }
+
+    fn go_back(&self) {
+        self.dispatcher
+            .dispatch(BrowserAction::NavigationPop.into())
+    }
+
+    fn can_go_back(&self) -> bool {
+        self.app_model.get_state().browser.can_pop()
+    }
+
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        self.wrapped_model.selection_context()
+    }
+
+    fn can_select_all(&self) -> bool {
+        true
+    }
+
+    fn start_selection(&self) {
+        if let Some(context) = self.wrapped_model.selection_context() {
+            self.dispatcher
+                .dispatch(AppAction::EnableSelection(context.clone()));
+        }
+    }
+
+    fn select_all(&self) {
+        self.wrapped_model.select_all()
+    }
+
+    fn cancel_selection(&self) {
+        self.dispatcher.dispatch(AppAction::CancelSelection)
+    }
+
+    fn selected_count(&self) -> usize {
+        self.app_model.get_state().selection.count()
+    }
+}
+
+mod common {
+
+    use super::*;
+
+    pub fn update_for_event<Model>(event: &AppEvent, widget: &HeaderBarWidget, model: &Rc<Model>)
+    where
+        Model: HeaderBarModel + 'static,
+    {
+        match event {
+            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(active)) => {
+                widget.set_selection_active(*active);
+            }
+            AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
+                widget.set_selection_count(model.selected_count());
+            }
+            AppEvent::BrowserEvent(BrowserEvent::NavigationPushed(_))
+            | AppEvent::BrowserEvent(BrowserEvent::NavigationPoppedTo(_))
+            | AppEvent::BrowserEvent(BrowserEvent::NavigationPopped)
+            | AppEvent::BrowserEvent(BrowserEvent::NavigationHidden(_)) => {
+                model.cancel_selection();
+                widget.set_can_go_back(model.can_go_back());
+            }
+            event if model.title_updated(event) => {
+                widget.set_title(model.title().as_ref().map(|s| &s[..]));
+            }
+            _ => {}
+        }
+    }
+
+    pub fn bind_headerbar<Model>(widget: &HeaderBarWidget, model: &Rc<Model>)
+    where
+        Model: HeaderBarModel + 'static,
+    {
+        widget.connect_selection_start(clone!(@weak model => move || model.start_selection()));
+        widget.connect_select_all(clone!(@weak model => move || model.select_all()));
+        widget.connect_selection_cancel(clone!(@weak model => move || model.cancel_selection()));
+        widget.connect_go_back(clone!(@weak model => move || model.go_back()));
+
+        widget.set_title(model.title().as_ref().map(|s| &s[..]));
+        widget.set_selection_possible(model.selection_context().is_some());
+        widget.set_select_all_possible(model.can_select_all());
+        widget.set_can_go_back(model.can_go_back());
+    }
+}
+
+pub struct HeaderBarComponent<Model: HeaderBarModel> {
+    widget: HeaderBarWidget,
+    model: Rc<Model>,
+}
+
+impl<Model> HeaderBarComponent<Model>
+where
+    Model: HeaderBarModel + 'static,
+{
+    pub fn new(widget: HeaderBarWidget, model: Rc<Model>) -> Self {
+        common::bind_headerbar(&widget, &model);
+        Self { widget, model }
+    }
+}
+
+impl<Model> EventListener for HeaderBarComponent<Model>
+where
+    Model: HeaderBarModel + 'static,
+{
+    fn on_event(&mut self, event: &AppEvent) {
+        common::update_for_event(event, &self.widget, &self.model);
+    }
+}
+
+// wrapper version ("Screen")
+pub struct StandardScreen<Model: HeaderBarModel> {
+    root: gtk::Widget,
+    widget: HeaderBarWidget,
+    model: Rc<Model>,
+    children: Vec<Box<dyn EventListener>>,
+}
+
+impl<Model> StandardScreen<Model>
+where
+    Model: HeaderBarModel + 'static,
+{
+    pub fn new(wrapped: impl ListenerComponent + 'static, model: Rc<Model>) -> Self {
+        let widget = HeaderBarWidget::new();
+        common::bind_headerbar(&widget, &model);
+
+        let root = gtk::BoxBuilder::new()
+            .orientation(gtk::Orientation::Vertical)
+            .build();
+        root.append(&widget);
+        root.append(wrapped.get_root_widget());
+
+        Self {
+            root: root.upcast(),
+            widget,
+            model,
+            children: vec![Box::new(wrapped)],
+        }
+    }
+}
+
+impl<Model> Component for StandardScreen<Model>
+where
+    Model: HeaderBarModel + 'static,
+{
+    fn get_root_widget(&self) -> &gtk::Widget {
+        &self.root
+    }
+
+    fn get_children(&mut self) -> Option<&mut Vec<Box<dyn EventListener>>> {
+        Some(&mut self.children)
+    }
+}
+
+impl<Model> EventListener for StandardScreen<Model>
+where
+    Model: HeaderBarModel + 'static,
+{
+    fn on_event(&mut self, event: &AppEvent) {
+        common::update_for_event(event, &self.widget, &self.model);
+        self.broadcast_event(event);
+    }
+}
diff --git a/src/app/components/headerbar/headerbar.ui b/src/app/components/headerbar/headerbar.ui
new file mode 100644
index 00000000..f220d584
--- /dev/null
+++ b/src/app/components/headerbar/headerbar.ui
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="HeaderBarWidget" parent="AdwBin">
+    <child type="root">
+      <object class="GtkOverlay" id="overlay">
+        <property name="hexpand">1</property>
+        <child>
+          <object class="AdwHeaderBar" id="main_header">
+            <property name="show-end-title-buttons">1</property>
+            <child>
+              <object class="GtkButton" id="go_back">
+                <property name="receives-default">1</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+                <property name="icon-name">go-previous-symbolic</property>
+                <property name="has-frame">0</property>
+              </object>
+            </child>
+            <child type="title">
+              <object class="AdwWindowTitle" id="title">
+                <property name="visible">1</property>
+                <property name="title" translatable="no">Spot</property>
+              </object>
+            </child>
+            <child type="end">
+              <object class="GtkButton" id="start_selection">
+                <property name="icon-name">object-select-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="overlay">
+          <object class="AdwHeaderBar" id="selection_header">
+            <property name="show-end-title-buttons">0</property>
+            <property name="visible">0</property>
+            <style>
+              <class name="selection-mode" />
+            </style>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="receives-default">1</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+                <property name="label" translatable="yes" comments="Button label. Exits selection mode.">Cancel</property>
+              </object>
+            </child>
+            <child type="title">
+              <object class="AdwWindowTitle" id="selection_title">
+                <property name="title"></property>
+              </object>
+            </child>
+            <child type="end">
+              <object class="GtkButton" id="select_all">
+                <property name="valign">center</property>
+                <property name="label" translatable="yes" comments="Button label. Selects all visible songs.">Select all</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/app/components/headerbar/mod.rs b/src/app/components/headerbar/mod.rs
new file mode 100644
index 00000000..dc91647f
--- /dev/null
+++ b/src/app/components/headerbar/mod.rs
@@ -0,0 +1,11 @@
+mod widget;
+pub use widget::*;
+
+mod component;
+pub use component::*;
+
+use glib::prelude::*;
+
+pub fn expose_widgets() {
+    widget::HeaderBarWidget::static_type();
+}
diff --git a/src/app/components/headerbar/widget.rs b/src/app/components/headerbar/widget.rs
new file mode 100644
index 00000000..760eb61e
--- /dev/null
+++ b/src/app/components/headerbar/widget.rs
@@ -0,0 +1,184 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+use libadwaita::subclass::prelude::BinImpl;
+
+use crate::app::components::labels;
+
+mod imp {
+
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/dev/alextren/Spot/components/headerbar.ui")]
+    pub struct HeaderBarWidget {
+        #[template_child]
+        pub main_header: TemplateChild<libadwaita::HeaderBar>,
+
+        #[template_child]
+        pub selection_header: TemplateChild<libadwaita::HeaderBar>,
+
+        #[template_child]
+        pub go_back: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub title: TemplateChild<libadwaita::WindowTitle>,
+
+        #[template_child]
+        pub selection_title: TemplateChild<libadwaita::WindowTitle>,
+
+        #[template_child]
+        pub start_selection: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub select_all: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub cancel: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub overlay: TemplateChild<gtk::Overlay>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for HeaderBarWidget {
+        const NAME: &'static str = "HeaderBarWidget";
+        type Type = super::HeaderBarWidget;
+        type ParentType = libadwaita::Bin;
+        type Interfaces = (gtk::Buildable,);
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for HeaderBarWidget {}
+
+    impl BuildableImpl for HeaderBarWidget {
+        fn add_child(
+            &self,
+            buildable: &Self::Type,
+            builder: &gtk::Builder,
+            child: &glib::Object,
+            type_: Option<&str>,
+        ) {
+            if Some("root") == type_ {
+                self.parent_add_child(buildable, builder, child, type_);
+            } else {
+                self.main_header
+                    .set_title_widget(child.downcast_ref::<gtk::Widget>());
+            }
+        }
+    }
+
+    impl WidgetImpl for HeaderBarWidget {}
+    impl BinImpl for HeaderBarWidget {}
+    impl WindowImpl for HeaderBarWidget {}
+}
+
+glib::wrapper! {
+    pub struct HeaderBarWidget(ObjectSubclass<imp::HeaderBarWidget>) @extends gtk::Widget, libadwaita::Bin;
+}
+
+impl HeaderBarWidget {
+    pub fn new() -> Self {
+        glib::Object::new(&[]).expect("Failed to create an instance of HeaderBarWidget")
+    }
+
+    fn widget(&self) -> &imp::HeaderBarWidget {
+        imp::HeaderBarWidget::from_instance(self)
+    }
+
+    pub fn connect_selection_start<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().start_selection.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_select_all<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().select_all.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_selection_cancel<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().cancel.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_go_back<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().go_back.connect_clicked(move |_| f());
+    }
+
+    pub fn set_can_go_back(&self, can_go_back: bool) {
+        self.widget().go_back.set_visible(can_go_back);
+    }
+
+    pub fn set_selection_possible(&self, possible: bool) {
+        self.widget().start_selection.set_visible(possible);
+    }
+
+    pub fn set_select_all_possible(&self, possible: bool) {
+        self.widget().select_all.set_visible(possible);
+    }
+
+    pub fn set_selection_active(&self, active: bool) {
+        if active {
+            self.widget()
+                .selection_title
+                .set_title(&labels::n_songs_selected_label(0));
+            self.widget().selection_title.show();
+            self.widget().selection_header.show();
+        } else {
+            self.widget().selection_title.hide();
+            self.widget().selection_header.hide();
+        }
+    }
+
+    pub fn set_selection_count(&self, count: usize) {
+        self.widget()
+            .selection_title
+            .set_title(&labels::n_songs_selected_label(count));
+    }
+
+    pub fn add_classes(&self, classes: &[&str]) {
+        let context = self.widget().main_header.style_context();
+        for &class in classes {
+            context.add_class(class);
+        }
+    }
+
+    pub fn remove_classes(&self, classes: &[&str]) {
+        let context = self.widget().main_header.style_context();
+        for &class in classes {
+            context.remove_class(class);
+        }
+    }
+
+    pub fn set_title_visible(&self, visible: bool) {
+        self.widget().title.set_visible(visible);
+    }
+
+    pub fn set_title_and_subtitle(&self, title: &str, subtitle: &str) {
+        self.widget().title.set_title(title);
+        self.widget().title.set_subtitle(subtitle);
+    }
+
+    pub fn set_title(&self, title: Option<&str>) {
+        self.widget().title.set_visible(title.is_some());
+        if let Some(title) = title {
+            self.widget().title.set_title(title);
+        }
+    }
+}
diff --git a/src/app/components/labels.rs b/src/app/components/labels.rs
index 9c7b564c..3bb216f6 100644
--- a/src/app/components/labels.rs
+++ b/src/app/components/labels.rs
@@ -4,9 +4,6 @@ lazy_static! {
     // translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
     pub static ref VIEW_ALBUM: String = gettext("View album");
 
-    // translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-    pub static ref MORE_FROM: String = gettext("More from");
-
     // translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
     pub static ref COPY_LINK: String = gettext("Copy link");
 
@@ -25,3 +22,34 @@ pub fn add_to_playlist_label(playlist: &str) -> String {
     }
     gettext!("Add to {}", playlist)
 }
+
+pub fn n_songs_selected_label(n: usize) -> String {
+    // this is just to fool xgettext, it doesn't like macros (or rust for that matter) :(
+    if cfg!(debug_assertions) {
+        // translators: This shows up when in selection mode. This text should be as short as possible.
+        ngettext("{} song selected", "{} songs selected", n as u32);
+    }
+    ngettext!("{} song selected", "{} songs selected", n as u32, n)
+}
+
+pub fn more_from_label(artist: &str) -> String {
+    // this is just to fool xgettext, it doesn't like macros (or rust for that matter) :(
+    if cfg!(debug_assertions) {
+        // translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+        gettext("More from {}");
+    }
+    gettext!("More from {}", glib::markup_escape_text(artist))
+}
+
+pub fn album_by_artist_label(album: &str, artist: &str) -> String {
+    // this is just to fool xgettext, it doesn't like macros (or rust for that matter) :(
+    if cfg!(debug_assertions) {
+        // translators: This is part of a larger label that reads "<Album> by <Artist>"
+        gettext("{} by {}");
+    }
+    gettext!(
+        "{} by {}",
+        glib::markup_escape_text(album),
+        glib::markup_escape_text(artist)
+    )
+}
diff --git a/src/app/components/library/library.rs b/src/app/components/library/library.rs
index f80a96d0..c09a0cca 100644
--- a/src/app/components/library/library.rs
+++ b/src/app/components/library/library.rs
@@ -90,7 +90,8 @@ impl LibraryWidget {
             },
         );
     }
-    pub fn get_status_page(&self) -> &libadwaita::StatusPage {
+
+    pub fn status_page(&self) -> &libadwaita::StatusPage {
         &imp::LibraryWidget::from_instance(self).status_page
     }
 }
@@ -139,7 +140,7 @@ impl EventListener for Library {
             }
             AppEvent::BrowserEvent(BrowserEvent::LibraryUpdated) => {
                 self.widget
-                    .get_status_page()
+                    .status_page()
                     .set_visible(!self.model.has_albums());
             }
             _ => {}
diff --git a/src/app/components/library/library.ui b/src/app/components/library/library.ui
index f4736c78..8f3ea44d 100644
--- a/src/app/components/library/library.ui
+++ b/src/app/components/library/library.ui
@@ -12,10 +12,10 @@
           <object class="GtkOverlay" id="overlay">
             <child>
               <object class="GtkFlowBox" id="flowbox">
-                <property name="margin-start">8</property>
-                <property name="margin-end">8</property>
-                <property name="margin-top">8</property>
-                <property name="margin-bottom">8</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
                 <property name="min-children-per-line">1</property>
                 <property name="selection-mode">none</property>
                 <property name="activate-on-single-click">0</property>
diff --git a/src/app/components/mod.rs b/src/app/components/mod.rs
index 3c8abf25..fc4304e8 100644
--- a/src/app/components/mod.rs
+++ b/src/app/components/mod.rs
@@ -73,9 +73,19 @@ pub use window::*;
 mod selection;
 pub use selection::*;
 
+mod headerbar;
+pub use headerbar::*;
+
 pub mod utils;
 
 pub mod labels;
+pub mod sidebar_listbox;
+
+pub fn expose_widgets() {
+    playback::expose_widgets();
+    selection::expose_widgets();
+    headerbar::expose_widgets();
+}
 
 impl dyn ActionDispatcher {
     fn call_spotify_and_dispatch<F, C>(&self, call: C)
diff --git a/src/app/components/navigation/factory.rs b/src/app/components/navigation/factory.rs
index 0fe3cfa5..1f844f7d 100644
--- a/src/app/components/navigation/factory.rs
+++ b/src/app/components/navigation/factory.rs
@@ -1,6 +1,7 @@
 use std::rc::Rc;
 
 use crate::app::components::*;
+use crate::app::state::SelectionContext;
 use crate::app::{ActionDispatcher, AppModel, Worker};
 
 pub struct ScreenFactory {
@@ -22,15 +23,36 @@ impl ScreenFactory {
         }
     }
 
-    pub fn make_library(&self) -> Library {
+    pub fn make_library(&self) -> impl ListenerComponent {
         let model = LibraryModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
-        Library::new(self.worker.clone(), model)
+        let screen_model = DefaultHeaderBarModel::new(
+            Some(gettext("Library")),
+            None,
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
+        StandardScreen::new(
+            Library::new(self.worker.clone(), model),
+            Rc::new(screen_model),
+        )
     }
 
-    pub fn make_saved_playlists(&self) -> SavedPlaylists {
-        let model =
-            SavedPlaylistsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
-        SavedPlaylists::new(self.worker.clone(), model)
+    pub fn make_saved_playlists_model(&self) -> SavedPlaylistsModel {
+        SavedPlaylistsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone())
+    }
+
+    pub fn make_saved_playlists(&self) -> impl ListenerComponent {
+        let model = self.make_saved_playlists_model();
+        let screen_model = DefaultHeaderBarModel::new(
+            Some(gettext("Playlists")),
+            None,
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
+        StandardScreen::new(
+            SavedPlaylists::new(self.worker.clone(), model),
+            Rc::new(screen_model),
+        )
     }
 
     pub fn make_now_playing(&self) -> impl ListenerComponent {
@@ -38,15 +60,32 @@ impl ScreenFactory {
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        SelectionTools::new(NowPlaying::new(Rc::clone(&model)), model)
+        let screen_model = SimpleHeaderBarModelWrapper::new(
+            Rc::clone(&model),
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
+        StandardScreen::new(
+            NowPlaying::new(model, self.worker.clone()),
+            Rc::new(screen_model),
+        )
     }
 
     pub fn make_saved_tracks(&self) -> impl ListenerComponent {
+        let screen_model = DefaultHeaderBarModel::new(
+            Some(gettext("Saved tracks")),
+            Some(SelectionContext::Default),
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
         let model = Rc::new(SavedTracksModel::new(
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        SelectionTools::new(SavedTracks::new(Rc::clone(&model)), model)
+        StandardScreen::new(
+            SavedTracks::new(model, self.worker.clone()),
+            Rc::new(screen_model),
+        )
     }
 
     pub fn make_album_details(&self, id: String) -> impl ListenerComponent {
@@ -55,10 +94,10 @@ impl ScreenFactory {
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        SelectionTools::new(Details::new(Rc::clone(&model), self.worker.clone()), model)
+        Details::new(model, self.worker.clone())
     }
 
-    pub fn make_search_results(&self) -> SearchResults {
+    pub fn make_search_results(&self) -> impl ListenerComponent {
         let model =
             SearchResultsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
         SearchResults::new(model, self.worker.clone())
@@ -70,9 +109,14 @@ impl ScreenFactory {
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        SelectionTools::new(
-            ArtistDetails::new(Rc::clone(&model), self.worker.clone()),
-            model,
+        let screen_model = SimpleHeaderBarModelWrapper::new(
+            Rc::clone(&model),
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
+        StandardScreen::new(
+            ArtistDetails::new(model, self.worker.clone()),
+            Rc::new(screen_model),
         )
     }
 
@@ -82,15 +126,29 @@ impl ScreenFactory {
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        SelectionTools::new(
-            PlaylistDetails::new(Rc::clone(&model), self.worker.clone()),
-            model,
+        let screen_model = SimpleHeaderBarModelWrapper::new(
+            Rc::clone(&model),
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
+        StandardScreen::new(
+            PlaylistDetails::new(model, self.worker.clone()),
+            Rc::new(screen_model),
         )
     }
 
-    pub fn make_user_details(&self, id: String) -> UserDetails {
+    pub fn make_user_details(&self, id: String) -> impl ListenerComponent {
+        let screen_model = DefaultHeaderBarModel::new(
+            None,
+            None,
+            Rc::clone(&self.app_model),
+            self.dispatcher.box_clone(),
+        );
         let model =
             UserDetailsModel::new(id, Rc::clone(&self.app_model), self.dispatcher.box_clone());
-        UserDetails::new(model, self.worker.clone())
+        StandardScreen::new(
+            UserDetails::new(model, self.worker.clone()),
+            Rc::new(screen_model),
+        )
     }
 }
diff --git a/src/app/components/navigation/home.rs b/src/app/components/navigation/home.rs
index f0bc41bd..0d1c50ec 100644
--- a/src/app/components/navigation/home.rs
+++ b/src/app/components/navigation/home.rs
@@ -1,79 +1,154 @@
 use gettextrs::*;
 use gtk::prelude::*;
 
-use crate::app::components::{Component, EventListener, ScreenFactory};
-use crate::app::AppEvent;
+use crate::app::components::sidebar_listbox::{SideBarItem, SideBarRow};
+use crate::app::components::{Component, EventListener, SavedPlaylistsModel, ScreenFactory};
+use crate::app::models::AlbumModel;
+use crate::app::{AppEvent, BrowserEvent};
 
-fn find_listbox_descendant(widget: &gtk::Widget) -> Option<gtk::ListBox> {
-    match widget.downcast_ref::<gtk::ListBox>() {
-        Some(listbox) => Some(listbox.clone()),
-        None => {
-            let next = widget.first_child()?;
-            find_listbox_descendant(&next)
-        }
+const LIBRARY: &str = "library";
+const SAVED_TRACKS: &str = "saved_tracks";
+const NOW_PLAYING: &str = "now_playing";
+const SAVED_PLAYLISTS: &str = "saved_playlists";
+const NUM_FIXED_ENTRIES: u32 = 5;
+const NUM_PLAYLISTS: usize = 20;
+
+fn add_to_stack_and_listbox(
+    stack: &gtk::Stack,
+    list_store: &gio::ListStore,
+    widget: &gtk::Widget,
+    name: &str,
+    title: &str,
+    icon_name: &str,
+    grayed_out: bool,
+) {
+    stack.add_titled(widget, Option::from(name), title);
+    list_store.append(&SideBarItem::new(name, title, icon_name, grayed_out))
+}
+
+fn make_playlist_item(playlist_item: AlbumModel) -> SideBarItem {
+    let mut title = playlist_item.album_title().unwrap();
+    if title.is_empty() {
+        title = gettext("Unnamed playlist");
     }
+
+    let id = playlist_item.uri().unwrap();
+
+    SideBarItem::new(id.as_str(), &title, "playlist2-symbolic", false)
 }
 
 pub struct HomePane {
     stack: gtk::Stack,
-    stack_sidebar: gtk::StackSidebar,
+    listbox: gtk::ListBox,
+    list_store: gio::ListStore,
     components: Vec<Box<dyn EventListener>>,
+    saved_playlists_model: SavedPlaylistsModel,
 }
 
 impl HomePane {
-    pub fn new(stack_sidebar: gtk::StackSidebar, screen_factory: &ScreenFactory) -> Self {
+    pub fn new(
+        listbox: gtk::ListBox,
+        screen_factory: &ScreenFactory,
+        list_store: gio::ListStore,
+    ) -> Self {
         let library = screen_factory.make_library();
         let saved_playlists = screen_factory.make_saved_playlists();
         let saved_tracks = screen_factory.make_saved_tracks();
         let now_playing = screen_factory.make_now_playing();
 
+        let saved_playlists_model = screen_factory.make_saved_playlists_model();
         let stack = gtk::Stack::new();
         stack.set_transition_type(gtk::StackTransitionType::Crossfade);
-        stack.add_titled(
+        add_to_stack_and_listbox(
+            &stack,
+            &list_store,
             library.get_root_widget(),
-            Some("library"),
+            LIBRARY,
             // translators: This is a sidebar entry to browse to saved albums.
             &gettext("Library"),
+            "library-music-symbolic",
+            false,
         );
-        stack.add_titled(
-            saved_playlists.get_root_widget(),
-            Some("saved_playlists"),
-            // translators: This is a sidebar entry to browse to saved playlists.
-            &gettext("Playlists"),
-        );
-        stack.add_titled(
+        add_to_stack_and_listbox(
+            &stack,
+            &list_store,
             saved_tracks.get_root_widget(),
-            Some("saved_tracks"),
+            SAVED_TRACKS,
             // translators: This is a sidebar entry to browse to saved tracks.
             &gettext("Saved tracks"),
+            "starred-symbolic",
+            false,
         );
-        stack.add_titled(
+        add_to_stack_and_listbox(
+            &stack,
+            &list_store,
             now_playing.get_root_widget(),
-            Some("now_playing"),
+            NOW_PLAYING,
             &gettext("Now playing"),
+            "music-queue-symbolic",
+            false,
+        );
+        list_store.append(&SideBarItem::new(
+            SAVED_PLAYLISTS,
+            // translators: This is a sidebar entry that marks that the entries below are playlists.
+            &gettext("Playlists"),
+            "",
+            true,
+        ));
+        add_to_stack_and_listbox(
+            &stack,
+            &list_store,
+            saved_playlists.get_root_widget(),
+            SAVED_PLAYLISTS,
+            // translators: This is a sidebar entry to browse to saved playlists.
+            &gettext("All Playlists"),
+            "view-app-grid-symbolic",
+            false,
         );
-
-        stack_sidebar.set_stack(&stack);
 
         Self {
             stack,
-            stack_sidebar,
+            listbox,
+            list_store,
             components: vec![
                 Box::new(library),
                 Box::new(saved_playlists),
                 Box::new(saved_tracks),
                 Box::new(now_playing),
             ],
+            saved_playlists_model,
         }
     }
 
     pub fn connect_navigated<F: Fn() + 'static>(&self, f: F) {
-        // stack sidebar wraps a listbox with a scroll window, so i'm cheating a bit there to get the listbox ;)
-        if let Some(listbox) = find_listbox_descendant(self.stack_sidebar.upcast_ref()) {
-            listbox.connect_row_activated(move |_, _| {
-                f();
-            });
+        let model = self.saved_playlists_model.clone();
+        self.listbox
+            .connect_row_activated(clone!(@weak self.stack as stack => move |_, row| {
+                let id = row.downcast_ref::<SideBarRow>().unwrap().id();
+                match id.as_str() {
+                    LIBRARY | SAVED_TRACKS | NOW_PLAYING | SAVED_PLAYLISTS => {
+                        stack.set_visible_child_name(&id);
+                        f();
+                    },
+                    _ => model.open_playlist(id),
+                }
+            }));
+    }
+
+    fn update_playlists_in_sidebar(&mut self) {
+        let mut vec = Vec::new();
+        let playlists = self.saved_playlists_model.get_playlists();
+        for (i, playlist_item) in playlists.iter().enumerate() {
+            if i == NUM_PLAYLISTS {
+                break;
+            }
+            vec.push(make_playlist_item(playlist_item).upcast());
         }
+        self.list_store.splice(
+            NUM_FIXED_ENTRIES,
+            self.list_store.n_items() - NUM_FIXED_ENTRIES,
+            vec.as_slice(),
+        );
     }
 }
 
@@ -89,8 +164,14 @@ impl Component for HomePane {
 
 impl EventListener for HomePane {
     fn on_event(&mut self, event: &AppEvent) {
-        if let AppEvent::NowPlayingShown = event {
-            self.stack.set_visible_child_name("now_playing");
+        match event {
+            AppEvent::NowPlayingShown => {
+                self.stack.set_visible_child_name("now_playing");
+            }
+            AppEvent::BrowserEvent(BrowserEvent::SavedPlaylistsUpdated) => {
+                self.update_playlists_in_sidebar();
+            }
+            _ => {}
         }
         self.broadcast_event(event);
     }
diff --git a/src/app/components/navigation/navigation.rs b/src/app/components/navigation/navigation.rs
index 6a5d9109..6c11ffa3 100644
--- a/src/app/components/navigation/navigation.rs
+++ b/src/app/components/navigation/navigation.rs
@@ -1,4 +1,3 @@
-use gtk::prelude::*;
 use libadwaita::NavigationDirection;
 use std::rc::Rc;
 
@@ -12,8 +11,8 @@ pub struct Navigation {
     model: Rc<NavigationModel>,
     leaflet: libadwaita::Leaflet,
     navigation_stack: gtk::Stack,
-    home_stack_sidebar: gtk::StackSidebar,
-    back_button: gtk::Button,
+    home_listbox: gtk::ListBox,
+    home_list_store: gio::ListStore,
     screen_factory: ScreenFactory,
     children: Vec<Box<dyn ListenerComponent>>,
 }
@@ -22,71 +21,46 @@ impl Navigation {
     pub fn new(
         model: NavigationModel,
         leaflet: libadwaita::Leaflet,
-        back_button: gtk::Button,
         navigation_stack: gtk::Stack,
-        home_stack_sidebar: gtk::StackSidebar,
+        home_listbox: gtk::ListBox,
+        home_list_store: gio::ListStore,
         screen_factory: ScreenFactory,
     ) -> Self {
         let model = Rc::new(model);
 
-        Self::connect_back_button(&back_button, &leaflet, &model);
-
-        leaflet.connect_folded_notify(clone!(@weak back_button, @weak model => move |leaflet| {
-            Self::update_back_button(&back_button, leaflet, &model);
-        }));
+        leaflet.connect_folded_notify(
+            clone!(@weak model => move |leaflet| {
+                let is_main = leaflet.visible_child_name().map(|s| s.as_str() == "main").unwrap_or(false);
+                let folded = leaflet.is_folded();
+                model.set_nav_hidden(folded && is_main);
+            })
+        );
 
         leaflet.connect_visible_child_name_notify(
-            clone!(@weak back_button, @weak model => move |leaflet| {
-                Self::update_back_button(&back_button, leaflet, &model);
-            }),
+            clone!(@weak model => move |leaflet| {
+                let is_main = leaflet.visible_child_name().map(|s| s.as_str() == "main").unwrap_or(false);
+                let folded = leaflet.is_folded();
+                model.set_nav_hidden(folded && is_main);
+            })
         );
 
         Self {
             model,
             leaflet,
             navigation_stack,
-            home_stack_sidebar,
-            back_button,
+            home_listbox,
+            home_list_store,
             screen_factory,
             children: vec![],
         }
     }
 
-    fn update_back_button(
-        back_button: &gtk::Button,
-        leaflet: &libadwaita::Leaflet,
-        model: &Rc<NavigationModel>,
-    ) {
-        let is_main = leaflet
-            .visible_child_name()
-            .map(|s| s.as_str() == "main")
-            .unwrap_or(false);
-        back_button.set_sensitive(leaflet.is_folded() && is_main || model.can_go_back());
-    }
-
-    fn connect_back_button(
-        back_button: &gtk::Button,
-        leaflet: &libadwaita::Leaflet,
-        model: &Rc<NavigationModel>,
-    ) {
-        back_button.connect_clicked(clone!(@weak leaflet, @weak model => move |_| {
-            let is_main = leaflet.visible_child_name().map(|s| s.as_str() == "main").unwrap_or(false);
-            let folded = leaflet.is_folded();
-            let can_go_back = model.can_go_back();
-            match (folded && is_main, can_go_back) {
-                (_, true) => {
-                    model.go_back();
-                }
-                (true, false) => {
-                    leaflet.navigate(NavigationDirection::Back);
-                }
-                (false, false) => {}
-            }
-        }));
-    }
-
     fn make_home(&self) -> Box<dyn ListenerComponent> {
-        let home = HomePane::new(self.home_stack_sidebar.clone(), &self.screen_factory);
+        let home = HomePane::new(
+            self.home_listbox.clone(),
+            &self.screen_factory,
+            self.home_list_store.clone(),
+        );
 
         home.connect_navigated(
             clone!(@weak self.model as model, @weak self.leaflet as leaflet => move || {
@@ -98,6 +72,10 @@ impl Navigation {
         Box::new(home)
     }
 
+    fn show_navigation(&self) {
+        self.leaflet.navigate(NavigationDirection::Back);
+    }
+
     fn push_screen(&mut self, name: &ScreenName) {
         let component: Box<dyn ListenerComponent> = match name {
             ScreenName::Home => self.make_home(),
@@ -116,6 +94,7 @@ impl Navigation {
 
         let widget = component.get_root_widget();
 
+        self.leaflet.navigate(NavigationDirection::Forward);
         self.navigation_stack
             .add_named(widget, Some(name.identifier().as_ref()));
         self.children.push(component);
@@ -144,10 +123,6 @@ impl Navigation {
             self.navigation_stack.remove(widget.get_root_widget());
         }
     }
-
-    fn do_update_back_button(&self) {
-        Self::update_back_button(&self.back_button, &self.leaflet, &self.model);
-    }
 }
 
 impl EventListener for Navigation {
@@ -155,19 +130,18 @@ impl EventListener for Navigation {
         match event {
             AppEvent::Started => {
                 self.push_screen(&ScreenName::Home);
-                self.do_update_back_button();
             }
             AppEvent::BrowserEvent(BrowserEvent::NavigationPushed(name)) => {
                 self.push_screen(name);
-                self.do_update_back_button();
+            }
+            AppEvent::BrowserEvent(BrowserEvent::NavigationHidden(false)) => {
+                self.show_navigation();
             }
             AppEvent::BrowserEvent(BrowserEvent::NavigationPopped) => {
                 self.pop();
-                self.do_update_back_button();
             }
             AppEvent::BrowserEvent(BrowserEvent::NavigationPoppedTo(name)) => {
                 self.pop_to(name);
-                self.do_update_back_button();
             }
             _ => {}
         };
diff --git a/src/app/components/navigation/navigation_model.rs b/src/app/components/navigation/navigation_model.rs
index 45006221..761327a5 100644
--- a/src/app/components/navigation/navigation_model.rs
+++ b/src/app/components/navigation/navigation_model.rs
@@ -16,11 +16,6 @@ impl NavigationModel {
         }
     }
 
-    pub fn go_back(&self) {
-        self.dispatcher
-            .dispatch(BrowserAction::NavigationPop.into())
-    }
-
     pub fn go_home(&self) {
         self.dispatcher
             .dispatch(BrowserAction::NavigationPopTo(ScreenName::Home).into())
@@ -30,8 +25,9 @@ impl NavigationModel {
         self.app_model.map_state(|s| s.browser.current_screen())
     }
 
-    pub fn can_go_back(&self) -> bool {
-        self.app_model.get_state().browser.can_pop()
+    pub fn set_nav_hidden(&self, hidden: bool) {
+        self.dispatcher
+            .dispatch(BrowserAction::SetNavigationHidden(hidden).into());
     }
 
     pub fn children_count(&self) -> usize {
diff --git a/src/app/components/now_playing/now_playing.css b/src/app/components/now_playing/now_playing.css
deleted file mode 100644
index 325aab65..00000000
--- a/src/app/components/now_playing/now_playing.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.now_playing {
-    background: @theme_base_color;
-}
\ No newline at end of file
diff --git a/src/app/components/now_playing/now_playing.rs b/src/app/components/now_playing/now_playing.rs
index 89a72844..0bfb2369 100644
--- a/src/app/components/now_playing/now_playing.rs
+++ b/src/app/components/now_playing/now_playing.rs
@@ -3,10 +3,10 @@ use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use std::rc::Rc;
 
-use crate::app::components::{display_add_css_provider, Component, EventListener, Playlist};
-use crate::app::{state::PlaybackEvent, AppEvent};
-
 use super::NowPlayingModel;
+use crate::app::components::{Component, EventListener, Playlist};
+use crate::app::{state::PlaybackEvent, AppEvent, Worker};
+use libadwaita::subclass::prelude::BinImpl;
 
 mod imp {
 
@@ -26,7 +26,7 @@ mod imp {
     impl ObjectSubclass for NowPlayingWidget {
         const NAME: &'static str = "NowPlayingWidget";
         type Type = super::NowPlayingWidget;
-        type ParentType = gtk::Box;
+        type ParentType = libadwaita::Bin;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -39,16 +39,15 @@ mod imp {
 
     impl ObjectImpl for NowPlayingWidget {}
     impl WidgetImpl for NowPlayingWidget {}
-    impl BoxImpl for NowPlayingWidget {}
+    impl BinImpl for NowPlayingWidget {}
 }
 
 glib::wrapper! {
-    pub struct NowPlayingWidget(ObjectSubclass<imp::NowPlayingWidget>) @extends gtk::Widget, gtk::Box;
+    pub struct NowPlayingWidget(ObjectSubclass<imp::NowPlayingWidget>) @extends gtk::Widget, libadwaita::Bin;
 }
 
 impl NowPlayingWidget {
     fn new() -> Self {
-        display_add_css_provider(resource!("/components/now_playing.css"));
         glib::Object::new(&[]).expect("Failed to create an instance of NowPlayingWidget")
     }
 
@@ -79,14 +78,19 @@ pub struct NowPlaying {
 }
 
 impl NowPlaying {
-    pub fn new(model: Rc<NowPlayingModel>) -> Self {
+    pub fn new(model: Rc<NowPlayingModel>, worker: Worker) -> Self {
         let widget = NowPlayingWidget::new();
 
         widget.connect_bottom_edge(clone!(@weak model => move || {
             model.load_more();
         }));
 
-        let playlist = Playlist::new(widget.song_list_widget().clone(), model.clone());
+        let playlist = Playlist::new(
+            widget.song_list_widget().clone(),
+            model.clone(),
+            worker,
+            true,
+        );
 
         Self {
             widget,
diff --git a/src/app/components/now_playing/now_playing.ui b/src/app/components/now_playing/now_playing.ui
index e339db46..1d805c80 100644
--- a/src/app/components/now_playing/now_playing.ui
+++ b/src/app/components/now_playing/now_playing.ui
@@ -1,40 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <template class="NowPlayingWidget" parent="GtkBox">
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkBox">
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
-        <property name="margin-top">8</property>
-        <property name="margin-bottom">8</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label" translatable="yes" comments="This is the visible name for the play queue. It appears in the sidebar as well.">Now playing</property>
-            <property name="ellipsize">end</property>
-            <property name="hexpand">1</property>
-            <property name="halign">start</property>
-            <style>
-              <class name="large-title"/>
-            </style>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparator"/>
-    </child>
+  <requires lib="gtk" version="4.0" />
+  <template class="NowPlayingWidget" parent="AdwBin">
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="vexpand">1</property>
         <child>
-          <object class="GtkListView" id="song_list"/>
+        <object class="AdwClampScrollable">
+        <property name="maximum-size">900</property>
+          <child>
+            <object class="GtkListView" id="song_list">
+            </object>
+          </child>
+        </object>
         </child>
       </object>
     </child>
-    <style>
-      <class name="now_playing"/>
-    </style>
   </template>
 </interface>
diff --git a/src/app/components/now_playing/now_playing_model.rs b/src/app/components/now_playing/now_playing_model.rs
index faf9d6e7..89bc6e9a 100644
--- a/src/app/components/now_playing/now_playing_model.rs
+++ b/src/app/components/now_playing/now_playing_model.rs
@@ -1,19 +1,20 @@
+use gettextrs::gettext;
 use gio::prelude::*;
 use gio::SimpleActionGroup;
 use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use crate::app::components::{labels, PlaylistModel, SelectionTool, SelectionToolsModel};
+use crate::app::components::SimpleHeaderBarModel;
+use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::SongDescription;
 use crate::app::models::SongModel;
 use crate::app::state::PlaylistChange;
+use crate::app::state::SelectionContext;
 use crate::app::state::{
-    PlaybackAction, PlaybackEvent, PlaybackState, SelectionAction, SelectionContext, SelectionState,
+    PlaybackAction, PlaybackEvent, PlaybackState, SelectionAction, SelectionState,
 };
 use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, AppState, ListDiff};
-use crate::{api::SpotifyApiClient, app::components::SimpleSelectionTool};
 
 pub struct NowPlayingModel {
     app_model: Rc<AppModel>,
@@ -110,11 +111,7 @@ impl PlaylistModel for NowPlayingModel {
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
         for artist in song.artists.iter() {
             menu.append(
-                Some(&format!(
-                    "{} {}",
-                    *labels::MORE_FROM,
-                    glib::markup_escape_text(&artist.name)
-                )),
+                Some(&labels::more_from_label(&artist.name)),
                 Some(&format!("song.view_artist_{}", artist.id)),
             );
         }
@@ -140,62 +137,32 @@ impl PlaylistModel for NowPlayingModel {
 
     fn enable_selection(&self) -> bool {
         self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(true));
+            .dispatch(AppAction::EnableSelection(SelectionContext::Queue));
         true
     }
 
     fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        let selection = self
-            .app_model
-            .map_state_opt(|s| Some(&s.selection))
-            .filter(|s| s.context == SelectionContext::Queue)?;
+        let selection = self.app_model.map_state(|s| &s.selection);
         Some(Box::new(selection))
     }
 }
 
-impl SelectionToolsModel for NowPlayingModel {
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher> {
-        self.dispatcher.box_clone()
+impl SimpleHeaderBarModel for NowPlayingModel {
+    fn title(&self) -> Option<String> {
+        Some(gettext("Now playing"))
     }
 
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync> {
-        self.app_model.get_spotify()
+    fn title_updated(&self, _: &AppEvent) -> bool {
+        false
     }
 
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        let selection = self
-            .app_model
-            .map_state_opt(|s| Some(&s.selection))
-            .filter(|s| s.context == SelectionContext::Queue)?;
-        Some(Box::new(selection))
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        Some(&SelectionContext::Queue)
     }
 
-    fn tools_visible(&self, _: &SelectionState) -> Vec<SelectionTool> {
-        vec![
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll),
-            SelectionTool::Simple(SimpleSelectionTool::MoveDown),
-            SelectionTool::Simple(SimpleSelectionTool::MoveUp),
-            SelectionTool::Simple(SimpleSelectionTool::Remove),
-        ]
-    }
-
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll) => {
-                let queue = self.queue();
-                let songs = queue.songs().collect::<Vec<&SongDescription>>();
-                self.handle_select_all_tool_borrowed(selection, &songs);
-            }
-            SelectionTool::Simple(SimpleSelectionTool::Remove) => {
-                self.dispatcher().dispatch(AppAction::DequeueSelection);
-            }
-            SelectionTool::Simple(SimpleSelectionTool::MoveDown) => {
-                self.dispatcher().dispatch(AppAction::MoveDownSelection);
-            }
-            SelectionTool::Simple(SimpleSelectionTool::MoveUp) => {
-                self.dispatcher().dispatch(AppAction::MoveUpSelection);
-            }
-            _ => self.default_handle_tool_activated(selection, tool),
-        };
+    fn select_all(&self) {
+        let songs: Vec<SongDescription> = self.queue().songs().cloned().collect();
+        self.dispatcher
+            .dispatch(SelectionAction::Select(songs).into());
     }
 }
diff --git a/src/app/components/playback/component.rs b/src/app/components/playback/component.rs
index 73e16269..7fc33aca 100644
--- a/src/app/components/playback/component.rs
+++ b/src/app/components/playback/component.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use crate::app::components::EventListener;
 use crate::app::models::SongDescription;
-use crate::app::state::{PlaybackAction, PlaybackEvent, RepeatMode, ScreenName};
+use crate::app::state::{PlaybackAction, PlaybackEvent, RepeatMode, ScreenName, SelectionEvent};
 use crate::app::{
     ActionDispatcher, AppAction, AppEvent, AppModel, AppState, BrowserAction, Worker,
 };
@@ -153,6 +153,9 @@ impl EventListener for PlaybackControl {
             | AppEvent::PlaybackEvent(PlaybackEvent::TrackSeeked(pos)) => {
                 self.sync_seek(*pos);
             }
+            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(active)) => {
+                self.widget.set_seekbar_visible(!active);
+            }
             _ => {}
         }
     }
diff --git a/src/app/components/playback/playback.css b/src/app/components/playback/playback.css
index affd77f8..3446a427 100644
--- a/src/app/components/playback/playback.css
+++ b/src/app/components/playback/playback.css
@@ -26,7 +26,6 @@
 }
 
 .playback-button {
-    -gtk-icon-size: 28px;
     min-width: 40px;
     min-height: 40px;
-}
\ No newline at end of file
+}
diff --git a/src/app/components/playback/playback_info.ui b/src/app/components/playback/playback_info.ui
index 92d28ebc..9abf6b44 100644
--- a/src/app/components/playback/playback_info.ui
+++ b/src/app/components/playback/playback_info.ui
@@ -37,5 +37,8 @@
                 </child>
             </object>
         </child>
+        <style>
+		    <class name="body"/>
+		</style>
     </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/src/app/components/playback/playback_widget.rs b/src/app/components/playback/playback_widget.rs
index 43b3604b..073b1431 100644
--- a/src/app/components/playback/playback_widget.rs
+++ b/src/app/components/playback/playback_widget.rs
@@ -112,7 +112,7 @@ impl PlaybackWidget {
             style_context.add_class(class);
             widget.seek_bar.set_range(0.0, duration);
             widget.seek_bar.set_value(0.0);
-            widget.track_position.set_text("0:00");
+            widget.track_position.set_text("0∶00");
             widget
                 .track_duration
                 .set_text(&format!(" / {}", format_duration(duration)));
@@ -191,6 +191,11 @@ impl PlaybackWidget {
         widget.controls_mobile.set_shuffled(shuffled);
     }
 
+    pub fn set_seekbar_visible(&self, visible: bool) {
+        let widget = imp::PlaybackWidget::from_instance(self);
+        widget.seek_bar.set_visible(visible);
+    }
+
     pub fn connect_play_pause<F>(&self, f: F)
     where
         F: Fn() + Clone + 'static,
diff --git a/src/app/components/playback/playback_widget.ui b/src/app/components/playback/playback_widget.ui
index c02501dd..a76531f2 100644
--- a/src/app/components/playback/playback_widget.ui
+++ b/src/app/components/playback/playback_widget.ui
@@ -66,16 +66,22 @@
                 <child>
                   <object class="GtkLabel" id="track_position">
                     <property name="sensitive">0</property>
-                    <property name="label">0:00</property>
+                    <property name="label">0∶00</property>
                     <property name="halign">end</property>
                     <property name="hexpand">1</property>
+										<style>
+											<class name="numeric"/>
+										</style>
                   </object>
                 </child>
                 <child>
                   <object class="GtkLabel" id="track_duration">
                     <property name="sensitive">0</property>
-                    <property name="label"> / 0:00</property>
+                    <property name="label"> / 0∶00</property>
                     <property name="halign">end</property>
+										<style>
+											<class name="numeric"/>
+										</style>
                   </object>
                 </child>
               </object>
@@ -105,4 +111,4 @@
       </object>
     </child>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/src/app/components/player_notifier.rs b/src/app/components/player_notifier.rs
index 34dcf78c..c61ddfaf 100644
--- a/src/app/components/player_notifier.rs
+++ b/src/app/components/player_notifier.rs
@@ -29,6 +29,9 @@ impl EventListener for PlayerNotifier {
             AppEvent::PlaybackEvent(PlaybackEvent::PlaybackPaused) => Some(Command::PlayerPause),
             AppEvent::PlaybackEvent(PlaybackEvent::PlaybackResumed) => Some(Command::PlayerResume),
             AppEvent::PlaybackEvent(PlaybackEvent::PlaybackStopped) => Some(Command::PlayerStop),
+            AppEvent::PlaybackEvent(PlaybackEvent::VolumeSet(volume)) => {
+                Some(Command::PlayerSetVolume(*volume))
+            }
             AppEvent::PlaybackEvent(PlaybackEvent::TrackChanged(id)) => {
                 SpotifyId::from_base62(id).ok().map(Command::PlayerLoad)
             }
diff --git a/src/app/components/playlist/playlist.rs b/src/app/components/playlist/playlist.rs
index d63be6c7..10a8ac06 100644
--- a/src/app/components/playlist/playlist.rs
+++ b/src/app/components/playlist/playlist.rs
@@ -8,7 +8,7 @@ use crate::app::components::{Component, EventListener, SongWidget};
 use crate::app::models::SongModel;
 use crate::app::{
     state::{PlaybackEvent, SelectionEvent, SelectionState},
-    AppEvent, ListDiff, ListStore,
+    AppEvent, ListDiff, ListStore, Worker,
 };
 
 #[derive(Clone, Copy, Debug)]
@@ -64,13 +64,22 @@ impl<Model> Playlist<Model>
 where
     Model: PlaylistModel + 'static,
 {
-    pub fn new(listview: gtk::ListView, model: Rc<Model>) -> Self {
+    pub fn new(
+        listview: gtk::ListView,
+        model: Rc<Model>,
+        worker: Worker,
+        show_song_covers: bool,
+    ) -> Self {
         let list_model = ListStore::new();
         let selection_model = gtk::NoSelection::new(Some(list_model.unsafe_store()));
         let factory = gtk::SignalListItemFactory::new();
 
+        let style_context = listview.style_context();
+        style_context.add_class("playlist");
+        listview.set_show_separators(true);
+        listview.set_valign(gtk::Align::Start);
+
         listview.set_factory(Some(&factory));
-        listview.style_context().add_class("playlist");
         listview.set_single_click_activate(true);
         listview.set_model(Some(&selection_model));
         Self::set_selection_active(&listview, model.is_selection_enabled());
@@ -84,7 +93,7 @@ where
             song_model.set_state(Self::get_item_state(&*model, &song_model));
 
             let widget = item.child().unwrap().downcast::<SongWidget>().unwrap();
-            widget.bind(&song_model);
+            widget.bind(&song_model, worker.clone(), show_song_covers);
 
             let id = &song_model.get_id();
             widget.set_actions(model.actions_for(id).as_ref());
diff --git a/src/app/components/playlist/song.css b/src/app/components/playlist/song.css
index 9a8a11e6..7cf470b5 100644
--- a/src/app/components/playlist/song.css
+++ b/src/app/components/playlist/song.css
@@ -1,17 +1,16 @@
-.song__index {
+.playlist .song__index {
   transition: opacity 150ms ease;
-  font-size: 12px;
-  margin: 4px 12px;
+  margin: 6px 12px;
   padding: 0;
   opacity: 1;
 }
 
-.song__icon, .song__checkbox {
-  transition: opacity 150ms ease;
-  opacity: 0;
+.song__cover {
+  border-radius: 6px;
+  border: 1px solid @card_shade_color;
 }
 
-.song--playing .song__index {
+.album__tracks .song__cover {
   opacity: 0;
 }
 
@@ -19,37 +18,36 @@
   opacity: 1;
 }
 
-.playlist--selectable .song__index, .playlist--selectable .song__icon {
+.song__icon,
+.song__checkbox,
+.song--playing .song__index,
+.song--playing .song__cover,
+.playlist--selectable .song__index,
+.playlist--selectable .song__cover,
+.playlist--selectable .song__icon {
+  transition: opacity 150ms ease;
   opacity: 0;
 }
 
-.playlist--selectable .song__checkbox, .playlist--selectable .song__checkbox check {
+
+.playlist--selectable .song__checkbox,
+.playlist--selectable .song__checkbox check {
   opacity: 1;
   filter: none;
 }
 
-.song__title {
-  font-size: 16px;
-}
-
-row {
-  transition: background-color 150ms ease;
-  margin: 1px 0;
-}
 
-.song--playing label.song__title, .song--playing label.song__index {
-  font-weight: bold;
+row:hover .song__menu--enabled, .song__menu--enabled:checked {
+  opacity: 1;
 }
 
-.song label.song__artist {
-  font-size: 12px;
-}
 
-.song label.song__duration {
-  font-size: 14px;
-  color: @insensitive_fg_color;
+/* Song Labels */
+.song--playing label.title {
+  font-weight: bold;
 }
 
+/* "Context Menu" */
 .song__menu {
   opacity: 0;
 }
@@ -58,20 +56,44 @@ row {
   opacity: 0.2;
 }
 
-row:hover .song__menu--enabled, .song__menu--enabled:checked {
-  opacity: 1;
-}
 
-.song check {
-  filter: opacity(1);
+/* Song boxed list styling */
+
+.playlist {
+  background: transparent;
 }
 
-/* copied from adwaita */
+.playlist row {
+  background: @card_bg_color;
+  margin-left:12px;
+  margin-right:12px;
+  box-shadow: 1px 0px 3px rgba(0, 0, 0, 0.07), -1px 0px 3px rgba(0, 0, 0, 0.07);
+  transition: background-color 150ms ease;
+}
 
 .playlist row:hover {
-  background-color: alpha(currentColor, 0.07);
+background-image: image(alpha(currentColor,0.03));
 }
-
 .playlist row:active {
-  background-color: alpha(currentColor, 0.16);
-}
\ No newline at end of file
+background-image: image(alpha(currentColor,0.08));
+}
+
+
+.playlist row:first-child {
+ margin-top: 12px;
+ border-radius: 12px 12px 0 0;
+}
+
+.playlist row:last-child {
+ margin-bottom: 12px;
+ border-bottom-color:rgba(0, 0, 0, 0);
+ border-radius: 0 0 12px 12px;
+ box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.21);
+}
+
+.playlist row:only-child {
+ margin-top: 12px;
+ margin-bottom: 12px;
+ border-radius: 12px 12px 12px 12px;
+}
+
diff --git a/src/app/components/playlist/song.rs b/src/app/components/playlist/song.rs
index 3629af25..21c59edb 100644
--- a/src/app/components/playlist/song.rs
+++ b/src/app/components/playlist/song.rs
@@ -1,6 +1,8 @@
 use crate::app::components::display_add_css_provider;
+use crate::app::loader::ImageLoader;
 use crate::app::models::SongModel;
 
+use crate::app::Worker;
 use gio::MenuModel;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -32,6 +34,9 @@ mod imp {
 
         #[template_child]
         pub menu_btn: TemplateChild<gtk::MenuButton>,
+
+        #[template_child]
+        pub song_cover: TemplateChild<gtk::Image>,
     }
 
     #[glib::object_subclass]
@@ -70,9 +75,13 @@ impl SongWidget {
         glib::Object::new(&[]).expect("Failed to create an instance of SongWidget")
     }
 
-    pub fn for_model(model: SongModel) -> Self {
+    fn widget(&self) -> &imp::SongWidget {
+        imp::SongWidget::from_instance(self)
+    }
+
+    pub fn for_model(model: SongModel, worker: Worker) -> Self {
         let _self = Self::new();
-        _self.bind(&model);
+        _self.bind(&model, worker, true);
         _self
     }
 
@@ -82,7 +91,7 @@ impl SongWidget {
 
     pub fn set_menu(&self, menu: Option<&MenuModel>) {
         if menu.is_some() {
-            let widget = imp::SongWidget::from_instance(self);
+            let widget = self.widget();
             widget.menu_btn.set_menu_model(menu);
             widget
                 .menu_btn
@@ -105,23 +114,49 @@ impl SongWidget {
         imp::SongWidget::from_instance(self)
             .song_checkbox
             .set_active(is_selected);
-        let song_class = "song-selected";
+    }
+
+    fn set_show_cover(&self, show_cover: bool) {
+        let song_class = "song--cover";
         let context = self.style_context();
-        if is_selected {
+        if show_cover {
             context.add_class(song_class);
         } else {
             context.remove_class(song_class);
         }
     }
 
-    pub fn bind(&self, model: &SongModel) {
-        let widget = imp::SongWidget::from_instance(self);
+    fn set_image(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
+        self.widget().song_cover.set_from_pixbuf(pixbuf);
+    }
+
+    pub fn set_art(&self, model: &SongModel, worker: Worker) {
+        if let Some(url) = model.cover_url() {
+            let _self = self.downgrade();
+            worker.send_local_task(async move {
+                if let Some(_self) = _self.upgrade() {
+                    let loader = ImageLoader::new();
+                    let result = loader.load_remote(&url, "jpg", 100, 100).await;
+                    _self.set_image(result.as_ref());
+                }
+            });
+        }
+    }
+
+    pub fn bind(&self, model: &SongModel, worker: Worker, show_cover: bool) {
+        let widget = self.widget();
 
-        model.bind_index(&*widget.song_index, "label");
         model.bind_title(&*widget.song_title, "label");
         model.bind_artist(&*widget.song_artist, "label");
         model.bind_duration(&*widget.song_length, "label");
 
+        self.set_show_cover(show_cover);
+        if show_cover {
+            self.set_art(model, worker);
+        } else {
+            model.bind_index(&*widget.song_index, "label");
+        }
+
         self.set_playing(model.get_playing());
         model.connect_playing_local(clone!(@weak self as _self => move |song| {
             _self.set_playing(song.get_playing());
diff --git a/src/app/components/playlist/song.ui b/src/app/components/playlist/song.ui
index 717c030d..72c95a0c 100644
--- a/src/app/components/playlist/song.ui
+++ b/src/app/components/playlist/song.ui
@@ -2,11 +2,10 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="SongWidget" parent="GtkGrid">
-    <property name="height-request">30</property>
-    <property name="margin-start">2</property>
-    <property name="margin-end">2</property>
-    <property name="margin-top">2</property>
-    <property name="margin-bottom">2</property>
+    <property name="margin-start">6</property>
+    <property name="margin-end">6</property>
+    <property name="margin-top">6</property>
+    <property name="margin-bottom">6</property>
     <property name="column-spacing">6</property>
     <property name="row-spacing">0</property>
     <child>
@@ -19,14 +18,29 @@
         <child>
           <object class="GtkLabel" id="song_index">
             <property name="label">1</property>
+            <property name="sensitive">0</property>
             <style>
               <class name="song__index"/>
+              <class name="numeric"/>
+            </style>
+          </object>
+        </child>
+        <child type="overlay">
+          <object class="GtkImage" id="song_cover">
+            <property name="pixel-size">30</property>
+            <property name="overflow">hidden</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="song__cover"/>
             </style>
           </object>
         </child>
         <child type="overlay">
           <object class="GtkImage" id="song_icon">
             <property name="icon-name">media-playback-start-symbolic</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
             <style>
               <class name="song__icon"/>
             </style>
@@ -57,7 +71,7 @@
           <property name="row">0</property>
         </layout>
         <style>
-          <class name="song__title"/>
+          <class name="title"/>
         </style>
       </object>
     </child>
@@ -74,15 +88,16 @@
           <property name="row">1</property>
         </layout>
         <style>
-          <class name="song__artist"/>
+          <class name="subtitle"/>
         </style>
       </object>
     </child>
     <child>
       <object class="GtkLabel" id="song_length">
         <property name="sensitive">0</property>
-        <property name="label">0:00</property>
-        <property name="max-width-chars">35</property>
+        <property name="label">0∶00</property>
+				<property name="justify">right</property>
+        <property name="max-width-chars">7</property>
         <property name="xalign">1</property>
         <property name="hexpand">0</property>
         <layout>
@@ -91,7 +106,7 @@
           <property name="row">0</property>
         </layout>
         <style>
-          <class name="song__duration"/>
+          <class name="numeric"/>
         </style>
       </object>
     </child>
@@ -103,13 +118,15 @@
         <property name="has-frame">0</property>
         <property name="hexpand">0</property>
         <property name="halign">end</property>
+				<property name="valign">center</property>
+        <property name="tooltip-text">Menu</property>
         <layout>
           <property name="row-span">2</property>
           <property name="column">4</property>
           <property name="row">0</property>
         </layout>
         <style>
-          <class name="song__menu"/>
+          <class name="circular"/>
           <class name="flat"/>
         </style>
       </object>
diff --git a/src/app/components/playlist_details/playlist_details.css b/src/app/components/playlist_details/playlist_details.css
deleted file mode 100644
index 2cf6da3d..00000000
--- a/src/app/components/playlist_details/playlist_details.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.playlist_details label.playlist_details__name {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-.playlist_details__owner label {
-  font-size: 16px;
-  color: @theme_text_color;
-}
-
-.playlist_details__owner {
-  padding: 0;
-}
-
-.playlist_details .playlist_details__art {
-  border-radius: 8px;
-}
-
-.playlist_details {
-  transition: opacity 0.3s ease;
-  opacity: 0;
-}
-
-.playlist_details--loaded {
-  opacity: 1;
-}
-
-listview.playlist_details__songs {
-  padding: 4px;
-  border-radius: 8px;
-}
-
-listview.playlist_details__songs row {
-  border-radius: 4px;
-}
\ No newline at end of file
diff --git a/src/app/components/playlist_details/playlist_details.rs b/src/app/components/playlist_details/playlist_details.rs
index 6f8b16f6..6686e3b2 100644
--- a/src/app/components/playlist_details/playlist_details.rs
+++ b/src/app/components/playlist_details/playlist_details.rs
@@ -4,11 +4,13 @@ use gtk::CompositeTemplate;
 use std::rc::Rc;
 
 use super::PlaylistDetailsModel;
+use crate::app::components::AlbumHeaderWidget;
 
-use crate::app::components::{display_add_css_provider, Component, EventListener, Playlist};
+use crate::app::components::{Component, EventListener, Playlist};
 use crate::app::dispatch::Worker;
 use crate::app::loader::ImageLoader;
 use crate::app::{AppEvent, BrowserEvent};
+use libadwaita::subclass::prelude::BinImpl;
 
 mod imp {
 
@@ -24,26 +26,20 @@ mod imp {
         pub header_revealer: TemplateChild<gtk::Revealer>,
 
         #[template_child]
-        pub name_label: TemplateChild<gtk::Label>,
+        pub header_widget: TemplateChild<AlbumHeaderWidget>,
 
         #[template_child]
-        pub owner_button: TemplateChild<gtk::LinkButton>,
-
-        #[template_child]
-        pub owner_button_label: TemplateChild<gtk::Label>,
+        pub header_mobile: TemplateChild<AlbumHeaderWidget>,
 
         #[template_child]
         pub tracks: TemplateChild<gtk::ListView>,
-
-        #[template_child]
-        pub art: TemplateChild<gtk::Image>,
     }
 
     #[glib::object_subclass]
     impl ObjectSubclass for PlaylistDetailsWidget {
         const NAME: &'static str = "PlaylistDetailsWidget";
         type Type = super::PlaylistDetailsWidget;
-        type ParentType = gtk::Box;
+        type ParentType = libadwaita::Bin;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -54,18 +50,25 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for PlaylistDetailsWidget {}
+    impl ObjectImpl for PlaylistDetailsWidget {
+        fn constructed(&self, obj: &Self::Type) {
+            self.parent_constructed(obj);
+            self.header_mobile.set_centered();
+            self.header_mobile.hide_actions();
+            self.header_widget.hide_actions();
+        }
+    }
+
     impl WidgetImpl for PlaylistDetailsWidget {}
-    impl BoxImpl for PlaylistDetailsWidget {}
+    impl BinImpl for PlaylistDetailsWidget {}
 }
 
 glib::wrapper! {
-    pub struct PlaylistDetailsWidget(ObjectSubclass<imp::PlaylistDetailsWidget>) @extends gtk::Widget, gtk::Box;
+    pub struct PlaylistDetailsWidget(ObjectSubclass<imp::PlaylistDetailsWidget>) @extends gtk::Widget, libadwaita::Bin;
 }
 
 impl PlaylistDetailsWidget {
     fn new() -> Self {
-        display_add_css_provider(resource!("/components/playlist_details.css"));
         glib::Object::new(&[]).expect("Failed to create an instance of PlaylistDetailsWidget")
     }
 
@@ -77,16 +80,6 @@ impl PlaylistDetailsWidget {
         self.widget().tracks.as_ref()
     }
 
-    fn connect_owner_clicked<F>(&self, f: F)
-    where
-        F: Fn() + 'static,
-    {
-        self.widget().owner_button.connect_activate_link(move |_| {
-            f();
-            glib::signal::Inhibit(true)
-        });
-    }
-
     fn connect_bottom_edge<F>(&self, f: F)
     where
         F: Fn() + 'static,
@@ -126,35 +119,31 @@ impl PlaylistDetailsWidget {
 
     fn set_loaded(&self) {
         let context = self.style_context();
-        context.add_class("playlist_details--loaded");
+        context.add_class("container--loaded");
     }
 
-    fn set_name_and_owner(
-        &self,
-        name: &str,
-        owner: &str,
-        art_url: Option<&String>,
-        worker: &Worker,
-    ) {
-        let widget = self.widget();
+    fn set_album_and_artist(&self, album: &str, artist: &str) {
+        self.widget()
+            .header_widget
+            .set_album_and_artist_and_year(album, artist, None);
+        self.widget()
+            .header_mobile
+            .set_album_and_artist_and_year(album, artist, None);
+    }
 
-        widget.name_label.set_label(name);
-        widget.owner_button_label.set_label(owner);
+    fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
+        self.widget().header_widget.set_artwork(art);
+        self.widget().header_mobile.set_artwork(art);
+    }
 
-        let weak_self = self.downgrade();
-        if let Some(art_url) = art_url.cloned() {
-            worker.send_local_task(async move {
-                if let Some(_self) = weak_self.upgrade() {
-                    let pixbuf = ImageLoader::new()
-                        .load_remote(&art_url[..], "jpg", 100, 100)
-                        .await;
-                    _self.widget().art.set_from_pixbuf(pixbuf.as_ref());
-                    _self.set_loaded();
-                }
-            });
-        } else {
-            self.set_loaded();
-        }
+    fn connect_artist_clicked<F>(&self, f: F)
+    where
+        F: Fn() + Clone + 'static,
+    {
+        self.widget()
+            .header_widget
+            .connect_artist_clicked(f.clone());
+        self.widget().header_mobile.connect_artist_clicked(f);
     }
 }
 
@@ -174,6 +163,8 @@ impl PlaylistDetails {
         let playlist = Box::new(Playlist::new(
             widget.playlist_tracks_widget().clone(),
             model.clone(),
+            worker.clone(),
+            true,
         ));
 
         widget.connect_header();
@@ -182,7 +173,7 @@ impl PlaylistDetails {
             model.load_more_tracks();
         }));
 
-        widget.connect_owner_clicked(clone!(@weak model => move || {
+        widget.connect_artist_clicked(clone!(@weak model => move || {
             model.view_owner();
         }));
 
@@ -200,8 +191,22 @@ impl PlaylistDetails {
             let owner = &info.owner.display_name[..];
             let art_url = info.art.as_ref();
 
-            self.widget
-                .set_name_and_owner(title, owner, art_url, &self.worker);
+            self.widget.set_album_and_artist(title, owner);
+
+            if let Some(art_url) = art_url.cloned() {
+                let widget = self.widget.downgrade();
+                self.worker.send_local_task(async move {
+                    let pixbuf = ImageLoader::new()
+                        .load_remote(&art_url[..], "jpg", 320, 320)
+                        .await;
+                    if let (Some(widget), Some(ref pixbuf)) = (widget.upgrade(), pixbuf) {
+                        widget.set_artwork(pixbuf);
+                        widget.set_loaded();
+                    }
+                });
+            } else {
+                self.widget.set_loaded();
+            }
         }
     }
 }
diff --git a/src/app/components/playlist_details/playlist_details.ui b/src/app/components/playlist_details/playlist_details.ui
index 803be9d6..f5851aee 100644
--- a/src/app/components/playlist_details/playlist_details.ui
+++ b/src/app/components/playlist_details/playlist_details.ui
@@ -1,73 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <template class="PlaylistDetailsWidget" parent="GtkBox">
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="PlaylistDetailsWidget" parent="AdwBin">
     <child>
-      <object class="AdwClamp">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
         <property name="vexpand">1</property>
         <property name="hexpand">1</property>
-        <property name="maximum-size">900</property>
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
-        <property name="margin-top">8</property>
-        <property name="margin-bottom">8</property>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="vexpand">1</property>
-            <property name="hexpand">1</property>
-            <property name="spacing">8</property>
+          <object class="GtkWindowHandle">
             <child>
-              <object class="GtkRevealer" id="header_revealer">
-                <property name="transition-type">slide-down</property>
+              <object class="AdwClamp">
+                <property name="maximum-size">900</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="valign">start</property>
-                    <property name="spacing">16</property>
-                    <property name="vexpand">0</property>
-                    <child>
-                      <object class="GtkImage" id="art">
-                        <property name="width-request">100</property>
-                        <property name="height-request">100</property>
-                        <property name="icon-name">emblem-music-symbolic</property>
-                        <style>
-                          <class name="playlist_details__art"/>
-                        </style>
-                      </object>
-                    </child>
+                  <object class="GtkRevealer" id="header_revealer">
+                    <property name="transition-type">slide-up</property>
                     <child>
-                      <object class="GtkBox">
+                      <object class="AdwSqueezer">
                         <property name="valign">center</property>
-                        <property name="orientation">vertical</property>
+                        <property name="homogeneous">0</property>
+                        <property name="transition-type">crossfade</property>
+                        <property name="switch-threshold-policy">natural</property>
                         <child>
-                          <object class="GtkLabel" id="name_label">
-                            <property name="halign">start</property>
-                            <property name="label">Playlist</property>
-                            <property name="wrap">1</property>
-                            <property name="xalign">0</property>
+                          <object class="AlbumHeaderWidget" id="header_widget">
                             <style>
-                              <class name="playlist_details__name"/>
+                              <class name="album__header" />
                             </style>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLinkButton" id="owner_button">
-                            <property name="receives-default">1</property>
-                            <property name="halign">start</property>
-                            <property name="valign">center</property>
-                            <property name="has-frame">0</property>
-                            <child>
-                              <object class="GtkLabel" id="owner_button_label">
-                                <property name="hexpand">1</property>
-                                <property name="vexpand">1</property>
-                                <property name="label">Owner</property>
-                                <property name="ellipsize">middle</property>
-                                <property name="xalign">0</property>
-                              </object>
-                            </child>
+                          <object class="AlbumHeaderWidget" id="header_mobile">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
                             <style>
-                              <class name="playlist_details__owner"/>
+                              <class name="header__mobile" />
                             </style>
                           </object>
                         </child>
@@ -75,21 +42,24 @@
                     </child>
                   </object>
                 </child>
+                <style>
+                  <class name="details__clamp" />
+                </style>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolled_window">
+            <property name="hscrollbar-policy">never</property>
+            <property name="propagate-natural-width">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="hscrollbar-policy">never</property>
-                <property name="propagate-natural-width">1</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
+              <object class="AdwClampScrollable">
+                <property name="maximum-size">900</property>
                 <child>
-                  <object class="GtkListView" id="tracks">
-                    <property name="valign">start</property>
-                    <style>
-                      <class name="playlist_details__songs"/>
-                    </style>
-                  </object>
+                  <object class="GtkListView" id="tracks" />
                 </child>
               </object>
             </child>
@@ -98,7 +68,7 @@
       </object>
     </child>
     <style>
-      <class name="playlist_details"/>
+      <class name="container" />
     </style>
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/src/app/components/playlist_details/playlist_details_model.rs b/src/app/components/playlist_details/playlist_details_model.rs
index af7daca5..a9444c51 100644
--- a/src/app/components/playlist_details/playlist_details_model.rs
+++ b/src/app/components/playlist_details/playlist_details_model.rs
@@ -3,14 +3,13 @@ use gio::SimpleActionGroup;
 use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use crate::api::SpotifyApiClient;
-use crate::app::components::{labels, PlaylistModel, SelectionTool, SelectionToolsModel};
-use crate::app::components::{AddSelectionTool, SimpleSelectionTool};
+use crate::app::components::SimpleHeaderBarModel;
+use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
+use crate::app::state::SelectionContext;
 use crate::app::state::{
-    BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionContext, SelectionState,
+    BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
 };
 use crate::app::{
     ActionDispatcher, AppAction, AppEvent, AppModel, AppState, BatchQuery, ListDiff, SongsSource,
@@ -18,6 +17,7 @@ use crate::app::{
 
 pub struct PlaylistDetailsModel {
     pub id: String,
+    _editable_selection_context: SelectionContext,
     app_model: Rc<AppModel>,
     dispatcher: Box<dyn ActionDispatcher>,
 }
@@ -25,12 +25,22 @@ pub struct PlaylistDetailsModel {
 impl PlaylistDetailsModel {
     pub fn new(id: String, app_model: Rc<AppModel>, dispatcher: Box<dyn ActionDispatcher>) -> Self {
         Self {
-            id,
+            id: id.clone(),
+            _editable_selection_context: SelectionContext::EditablePlaylist(id),
             app_model,
             dispatcher,
         }
     }
 
+    fn state(&self) -> Ref<'_, AppState> {
+        self.app_model.get_state()
+    }
+
+    fn is_playlist_editable(&self) -> bool {
+        let state = self.app_model.get_state();
+        state.logged_user.playlists.iter().any(|p| p.id == self.id)
+    }
+
     fn songs_ref(&self) -> Option<impl Deref<Target = SongList> + '_> {
         self.app_model.map_state_opt(|s| {
             Some(
@@ -52,11 +62,6 @@ impl PlaylistDetailsModel {
         })
     }
 
-    fn is_playlist_writable(&self) -> bool {
-        let state = self.app_model.get_state();
-        state.logged_user.playlists.iter().any(|p| p.id == self.id)
-    }
-
     pub fn load_playlist_info(&self) {
         let api = self.app_model.get_spotify();
         let id = self.id.clone();
@@ -100,12 +105,6 @@ impl PlaylistDetailsModel {
     }
 }
 
-impl PlaylistDetailsModel {
-    fn state(&self) -> Ref<'_, AppState> {
-        self.app_model.get_state()
-    }
-}
-
 impl PlaylistModel for PlaylistDetailsModel {
     fn current_song_id(&self) -> Option<String> {
         self.state().playback.current_song_id().cloned()
@@ -167,11 +166,7 @@ impl PlaylistModel for PlaylistDetailsModel {
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
         for artist in song.artists.iter() {
             menu.append(
-                Some(&format!(
-                    "{} {}",
-                    *labels::MORE_FROM,
-                    glib::markup_escape_text(&artist.name)
-                )),
+                Some(&labels::more_from_label(&artist.name)),
                 Some(&format!("song.view_artist_{}", artist.id)),
             );
         }
@@ -196,8 +191,9 @@ impl PlaylistModel for PlaylistDetailsModel {
     }
 
     fn enable_selection(&self) -> bool {
-        self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(true));
+        self.dispatcher.dispatch(AppAction::EnableSelection(
+            self.selection_context().unwrap().clone(),
+        ));
         true
     }
 
@@ -206,76 +202,28 @@ impl PlaylistModel for PlaylistDetailsModel {
     }
 }
 
-impl SelectionToolsModel for PlaylistDetailsModel {
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher> {
-        self.dispatcher.box_clone()
-    }
-
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync> {
-        self.app_model.get_spotify()
+impl SimpleHeaderBarModel for PlaylistDetailsModel {
+    fn title(&self) -> Option<String> {
+        None
     }
 
-    fn tools_visible(&self, _: &SelectionState) -> Vec<SelectionTool> {
-        let mut playlists: Vec<SelectionTool> = self
-            .app_model
-            .get_state()
-            .logged_user
-            .playlists
-            .iter()
-            .filter(|p| p.id != self.id)
-            .map(|p| SelectionTool::Add(AddSelectionTool::AddToPlaylist(p.clone())))
-            .collect();
-        let mut tools = vec![
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll),
-            SelectionTool::Add(AddSelectionTool::AddToQueue),
-        ];
-        tools.append(&mut playlists);
-        if self.is_playlist_writable() {
-            tools.push(SelectionTool::Simple(SimpleSelectionTool::Remove));
-        }
-        tools
-    }
-
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        let selection = self
-            .app_model
-            .map_state_opt(|s| Some(&s.selection))
-            .filter(|s| s.context == SelectionContext::Playlist)?;
-        Some(Box::new(selection))
+    fn title_updated(&self, _: &AppEvent) -> bool {
+        false
     }
 
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll) => {
-                if let Some(songs) = self.songs_ref() {
-                    let vec = songs.iter().collect::<Vec<&SongDescription>>();
-                    self.handle_select_all_tool_borrowed(selection, &vec[..]);
-                }
-            }
-            SelectionTool::Simple(SimpleSelectionTool::Remove) => {
-                self.handle_remove_from_playlist_tool(selection, &self.id);
-            }
-            _ => self.default_handle_tool_activated(selection, tool),
-        };
+    fn selection_context(&self) -> Option<&SelectionContext> {
+        Some(if self.is_playlist_editable() {
+            &self._editable_selection_context
+        } else {
+            &SelectionContext::Playlist
+        })
     }
-}
 
-impl PlaylistDetailsModel {
-    fn handle_remove_from_playlist_tool(&self, selection: &SelectionState, playlist: &str) {
-        let api = self.spotify_client();
-        let id = playlist.to_string();
-        let uris: Vec<String> = selection
-            .peek_selection()
-            .map(|s| &s.uri)
-            .cloned()
-            .collect();
-        self.dispatcher()
-            .call_spotify_and_dispatch_many(move || async move {
-                api.remove_from_playlist(&id, uris.clone()).await?;
-                Ok(vec![
-                    BrowserAction::RemoveTracksFromPlaylist(uris).into(),
-                    SelectionAction::Clear.into(),
-                ])
-            })
+    fn select_all(&self) {
+        if let Some(songs) = self.songs_ref() {
+            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
+            self.dispatcher
+                .dispatch(SelectionAction::Select(songs).into());
+        }
     }
 }
diff --git a/src/app/components/saved_playlists/saved_playlists_model.rs b/src/app/components/saved_playlists/saved_playlists_model.rs
index 062aadff..0140c150 100644
--- a/src/app/components/saved_playlists/saved_playlists_model.rs
+++ b/src/app/components/saved_playlists/saved_playlists_model.rs
@@ -23,6 +23,10 @@ impl SavedPlaylistsModel {
         self.app_model.map_state_opt(|s| s.browser.home_state())
     }
 
+    pub fn get_playlists(&self) -> ListStore<AlbumModel> {
+        self.state().unwrap().playlists.clone()
+    }
+
     pub fn get_list_store(&self) -> Option<impl Deref<Target = ListStore<AlbumModel>> + '_> {
         Some(Ref::map(self.state()?, |s| &s.playlists))
     }
@@ -67,4 +71,8 @@ impl SavedPlaylistsModel {
     pub fn open_playlist(&self, id: String) {
         self.dispatcher.dispatch(AppAction::ViewPlaylist(id));
     }
+
+    pub fn clone(&self) -> SavedPlaylistsModel {
+        SavedPlaylistsModel::new(self.app_model.clone(), self.dispatcher.box_clone())
+    }
 }
diff --git a/src/app/components/saved_tracks/saved_tracks.css b/src/app/components/saved_tracks/saved_tracks.css
deleted file mode 100644
index 6d3491ac..00000000
--- a/src/app/components/saved_tracks/saved_tracks.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.saved_tracks {
-    background: @theme_base_color;
-}
\ No newline at end of file
diff --git a/src/app/components/saved_tracks/saved_tracks.rs b/src/app/components/saved_tracks/saved_tracks.rs
index c9079a4f..04d4f019 100644
--- a/src/app/components/saved_tracks/saved_tracks.rs
+++ b/src/app/components/saved_tracks/saved_tracks.rs
@@ -3,11 +3,11 @@ use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use std::rc::Rc;
 
-use crate::app::components::{display_add_css_provider, Component, EventListener, Playlist};
-use crate::app::state::LoginEvent;
-use crate::app::AppEvent;
-
 use super::SavedTracksModel;
+use crate::app::components::{Component, EventListener, Playlist};
+use crate::app::state::LoginEvent;
+use crate::app::{AppEvent, Worker};
+use libadwaita::subclass::prelude::BinImpl;
 
 mod imp {
 
@@ -27,7 +27,7 @@ mod imp {
     impl ObjectSubclass for SavedTracksWidget {
         const NAME: &'static str = "SavedTracksWidget";
         type Type = super::SavedTracksWidget;
-        type ParentType = gtk::Box;
+        type ParentType = libadwaita::Bin;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -40,16 +40,15 @@ mod imp {
 
     impl ObjectImpl for SavedTracksWidget {}
     impl WidgetImpl for SavedTracksWidget {}
-    impl BoxImpl for SavedTracksWidget {}
+    impl BinImpl for SavedTracksWidget {}
 }
 
 glib::wrapper! {
-    pub struct SavedTracksWidget(ObjectSubclass<imp::SavedTracksWidget>) @extends gtk::Widget, gtk::Box;
+    pub struct SavedTracksWidget(ObjectSubclass<imp::SavedTracksWidget>) @extends gtk::Widget, libadwaita::Bin;
 }
 
 impl SavedTracksWidget {
     fn new() -> Self {
-        display_add_css_provider(resource!("/components/saved_tracks.css"));
         glib::Object::new(&[]).expect("Failed to create an instance of SavedTracksWidget")
     }
 
@@ -80,14 +79,19 @@ pub struct SavedTracks {
 }
 
 impl SavedTracks {
-    pub fn new(model: Rc<SavedTracksModel>) -> Self {
+    pub fn new(model: Rc<SavedTracksModel>, worker: Worker) -> Self {
         let widget = SavedTracksWidget::new();
 
         widget.connect_bottom_edge(clone!(@weak model => move || {
             model.load_more();
         }));
 
-        let playlist = Playlist::new(widget.song_list_widget().clone(), model.clone());
+        let playlist = Playlist::new(
+            widget.song_list_widget().clone(),
+            model.clone(),
+            worker,
+            true,
+        );
 
         Self {
             widget,
diff --git a/src/app/components/saved_tracks/saved_tracks.ui b/src/app/components/saved_tracks/saved_tracks.ui
index 3180faa1..1e620412 100644
--- a/src/app/components/saved_tracks/saved_tracks.ui
+++ b/src/app/components/saved_tracks/saved_tracks.ui
@@ -1,40 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <template class="SavedTracksWidget" parent="GtkBox">
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkBox">
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
-        <property name="margin-top">8</property>
-        <property name="margin-bottom">8</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label" translatable="yes" comments="This is the visible name for the list of liked songs. It appears in the sidebar as well.">Saved tracks</property>
-            <property name="ellipsize">end</property>
-            <property name="hexpand">1</property>
-            <property name="halign">start</property>
-            <style>
-              <class name="large-title"/>
-            </style>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparator"/>
-    </child>
+  <requires lib="gtk" version="4.0" />
+  <template class="SavedTracksWidget" parent="AdwBin">
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="vexpand">1</property>
         <child>
-          <object class="GtkListView" id="song_list"/>
+        <object class="AdwClampScrollable">
+        <property name="maximum-size">900</property>
+          <child>
+            <object class="GtkListView" id="song_list">
+            </object>
+          </child>
+        </object>
         </child>
       </object>
     </child>
-    <style>
-      <class name="saved_tracks"/>
-    </style>
   </template>
 </interface>
diff --git a/src/app/components/saved_tracks/saved_tracks_model.rs b/src/app/components/saved_tracks/saved_tracks_model.rs
index 6b132907..8d29ea90 100644
--- a/src/app/components/saved_tracks/saved_tracks_model.rs
+++ b/src/app/components/saved_tracks/saved_tracks_model.rs
@@ -2,16 +2,15 @@ use gio::prelude::*;
 use gio::SimpleActionGroup;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use crate::app::components::{labels, PlaylistModel, SelectionTool, SelectionToolsModel};
+use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
-use crate::app::state::{PlaybackAction, SelectionAction, SelectionContext, SelectionState};
+use crate::app::state::SelectionContext;
+use crate::app::state::{PlaybackAction, SelectionAction, SelectionState};
 use crate::app::{
     ActionDispatcher, AppAction, AppEvent, AppModel, BatchQuery, BrowserAction, BrowserEvent,
     ListDiff, SongsSource,
 };
-use crate::{api::SpotifyApiClient, app::components::SimpleSelectionTool};
 
 pub struct SavedTracksModel {
     app_model: Rc<AppModel>,
@@ -124,11 +123,7 @@ impl PlaylistModel for SavedTracksModel {
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
         for artist in song.artists.iter() {
             menu.append(
-                Some(&format!(
-                    "{} {}",
-                    *labels::MORE_FROM,
-                    glib::markup_escape_text(&artist.name)
-                )),
+                Some(&labels::more_from_label(&artist.name)),
                 Some(&format!("song.view_artist_{}", artist.id)),
             );
         }
@@ -153,49 +148,12 @@ impl PlaylistModel for SavedTracksModel {
 
     fn enable_selection(&self) -> bool {
         self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(true));
+            .dispatch(AppAction::EnableSelection(SelectionContext::Default));
         true
     }
 
     fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        let selection = self
-            .app_model
-            .map_state_opt(|s| Some(&s.selection))
-            .filter(|s| s.context == SelectionContext::Queue)?;
+        let selection = self.app_model.map_state(|s| &s.selection);
         Some(Box::new(selection))
     }
 }
-
-impl SelectionToolsModel for SavedTracksModel {
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher> {
-        self.dispatcher.box_clone()
-    }
-
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync> {
-        self.app_model.get_spotify()
-    }
-
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        let selection = self
-            .app_model
-            .map_state_opt(|s| Some(&s.selection))
-            .filter(|s| s.context == SelectionContext::Queue)?;
-        Some(Box::new(selection))
-    }
-
-    fn tools_visible(&self, _: &SelectionState) -> Vec<SelectionTool> {
-        vec![SelectionTool::Simple(SimpleSelectionTool::SelectAll)]
-    }
-
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Simple(SimpleSelectionTool::SelectAll) => {
-                if let Some(songs) = self.songs() {
-                    let vec = songs.iter().collect::<Vec<&SongDescription>>();
-                    self.handle_select_all_tool_borrowed(selection, &vec[..]);
-                }
-            }
-            _ => self.default_handle_tool_activated(selection, tool),
-        };
-    }
-}
diff --git a/src/app/components/search/mod.rs b/src/app/components/search/mod.rs
index 2be25fa3..77f57295 100644
--- a/src/app/components/search/mod.rs
+++ b/src/app/components/search/mod.rs
@@ -4,8 +4,5 @@ pub use search::*;
 mod search_model;
 pub use search_model::*;
 
-mod search_bar;
-pub use search_bar::*;
-
-mod search_bar_model;
-pub use search_bar_model::*;
+mod search_button;
+pub use search_button::*;
diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
index 81dd0913..65a7314b 100644
--- a/src/app/components/search/search.rs
+++ b/src/app/components/search/search.rs
@@ -1,4 +1,3 @@
-use gettextrs::*;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
@@ -19,7 +18,16 @@ mod imp {
     #[template(resource = "/dev/alextren/Spot/components/search.ui")]
     pub struct SearchResultsWidget {
         #[template_child]
-        pub results_label: TemplateChild<gtk::Label>,
+        pub go_back: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub search_entry: TemplateChild<gtk::SearchEntry>,
+
+        #[template_child]
+        pub status_page: TemplateChild<libadwaita::StatusPage>,
+
+        #[template_child]
+        pub search_results: TemplateChild<gtk::Widget>,
 
         #[template_child]
         pub albums_results: TemplateChild<gtk::FlowBox>,
@@ -57,11 +65,39 @@ impl SearchResultsWidget {
         glib::Object::new(&[]).expect("Failed to create an instance of SearchResultsWidget")
     }
 
+    fn widget(&self) -> &imp::SearchResultsWidget {
+        imp::SearchResultsWidget::from_instance(self)
+    }
+
+    pub fn connect_go_back<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().go_back.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_search_updated<F>(&self, f: F)
+    where
+        F: Fn(String) + 'static,
+    {
+        self.widget()
+            .search_entry
+            .connect_changed(clone!(@weak self as _self => move |s| {
+                let query = s.text();
+                let query = query.as_str();
+                _self.widget().status_page.set_visible(query.is_empty());
+                _self.widget().search_results.set_visible(!query.is_empty());
+                if !query.is_empty() {
+                    f(query.to_string());
+                }
+            }));
+    }
+
     fn bind_albums_results<F>(&self, worker: Worker, store: &gio::ListStore, on_album_pressed: F)
     where
         F: Fn(&String) + Clone + 'static,
     {
-        imp::SearchResultsWidget::from_instance(self)
+        self.widget()
             .albums_results
             .bind_model(Some(store), move |item| {
                 wrap_flowbox_item(item, |album_model| {
@@ -81,7 +117,7 @@ impl SearchResultsWidget {
     where
         F: Fn(&String) + Clone + 'static,
     {
-        imp::SearchResultsWidget::from_instance(self)
+        self.widget()
             .artist_results
             .bind_model(Some(store), move |item| {
                 wrap_flowbox_item(item, |artist_model| {
@@ -96,14 +132,6 @@ impl SearchResultsWidget {
                 })
             });
     }
-
-    fn set_search_query(&self, query: &str) {
-        // translators: This text is part of a larger text that says "Search results for <search term>".
-        let formatted = format!("{} « {} »", gettext("Search results for"), query);
-        imp::SearchResultsWidget::from_instance(self)
-            .results_label
-            .set_label(&formatted[..]);
-    }
 }
 
 pub struct SearchResults {
@@ -122,6 +150,14 @@ impl SearchResults {
         let album_results_model = gio::ListStore::new(AlbumModel::static_type());
         let artist_results_model = gio::ListStore::new(ArtistModel::static_type());
 
+        widget.connect_go_back(clone!(@weak model => move || {
+            model.go_back();
+        }));
+
+        widget.connect_search_updated(clone!(@weak model => move |q| {
+            model.search(q);
+        }));
+
         widget.bind_albums_results(
             worker.clone(),
             &album_results_model,
@@ -154,6 +190,7 @@ impl SearchResults {
                 self.album_results_model.append(&AlbumModel::new(
                     &album.artists_name(),
                     &album.title,
+                    album.year(),
                     &album.art,
                     &album.id,
                 ));
@@ -176,10 +213,6 @@ impl SearchResults {
             600,
             clone!(@weak self.model as model => move || model.fetch_results()),
         );
-
-        if let Some(query) = self.model.get_query() {
-            self.widget.set_search_query(&*query);
-        }
     }
 }
 
diff --git a/src/app/components/search/search.ui b/src/app/components/search/search.ui
index 0fc2a1f4..a93fdcf8 100644
--- a/src/app/components/search/search.ui
+++ b/src/app/components/search/search.ui
@@ -1,109 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
+  <requires lib="gtk" version="4.0" />
   <template class="SearchResultsWidget" parent="GtkBox">
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkScrolledWindow">
+      <object class="AdwHeaderBar" id="main_header">
+        <property name="show-end-title-buttons">1</property>
+        <child>
+          <object class="GtkButton" id="go_back">
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="icon-name">go-previous-symbolic</property>
+            <property name="has-frame">0</property>
+          </object>
+        </child>
+        <child type="title">
+          <object class="GtkSearchEntry" id="search_entry">
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkOverlay" id="overlay">
         <property name="hexpand">1</property>
         <property name="vexpand">1</property>
-        <property name="hscrollbar-policy">never</property>
-        <property name="child">
-          <object class="GtkBox">
-            <property name="vexpand">0</property>
-            <property name="margin-start">8</property>
-            <property name="margin-end">8</property>
-            <property name="margin-top">8</property>
-            <property name="margin-bottom">8</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">8</property>
-            <child>
+        <child>
+          <object class="GtkScrolledWindow" id="search_results">
+            <property name="visible">0</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="child">
               <object class="GtkBox">
-                <property name="hexpand">1</property>
-                <property name="valign">start</property>
-                <child>
-                  <object class="GtkLabel" id="results_label">
-                    <property name="hexpand">1</property>
-                    <property name="halign">start</property>
-                    <property name="label">Search results</property>
-                    <property name="wrap">1</property>
-                    <property name="ellipsize">start</property>
-                    <property name="lines">2</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="large-title"/>
-                    </style>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkExpander">
-                <property name="margin-start">4</property>
-                <property name="margin-end">4</property>
-                <property name="expanded">1</property>
                 <property name="vexpand">0</property>
-                <property name="valign">start</property>
+                <property name="margin-start">8</property>
+                <property name="margin-end">8</property>
+                <property name="margin-top">8</property>
+                <property name="margin-bottom">8</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">8</property>
                 <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="vscrollbar-policy">never</property>
-                    <property name="propagate-natural-height">0</property>
-                    <property name="child">
-                      <object class="GtkFlowBox" id="albums_results">
-                        <property name="halign">start</property>
-                        <property name="hexpand">1</property>
-                        <property name="vexpand">0</property>
-                        <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="max-children-per-line">1</property>
-                        <property name="selection-mode">none</property>
-                        <property name="activate-on-single-click">0</property>
+                  <object class="GtkExpander">
+                    <property name="margin-start">4</property>
+                    <property name="margin-end">4</property>
+                    <property name="expanded">1</property>
+                    <property name="vexpand">0</property>
+                    <property name="valign">start</property>
+                    <child>
+                      <object class="GtkScrolledWindow">
+                        <property name="vscrollbar-policy">never</property>
+                        <property name="propagate-natural-height">0</property>
+                        <property name="child">
+                          <object class="GtkFlowBox" id="albums_results">
+                            <property name="halign">start</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">0</property>
+                            <property name="valign">start</property>
+                            <property name="orientation">vertical</property>
+                            <property name="max-children-per-line">1</property>
+                            <property name="selection-mode">none</property>
+                            <property name="activate-on-single-click">0</property>
+                          </object>
+                        </property>
                       </object>
-                    </property>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes" comments="This is the title of a section of the search results">Albums</property>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes" comments="This is the title of a section of the search results">Albums</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkExpander">
-                <property name="margin-start">4</property>
-                <property name="margin-end">4</property>
-                <property name="margin-bottom">4</property>
-                <property name="expanded">1</property>
-                <property name="vexpand">0</property>
-                <property name="valign">start</property>
                 <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="vscrollbar-policy">never</property>
-                    <property name="propagate-natural-height">0</property>
-                    <property name="child">
-                      <object class="GtkFlowBox" id="artist_results">
-                        <property name="halign">start</property>
-                        <property name="hexpand">1</property>
-                        <property name="vexpand">0</property>
-                        <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="max-children-per-line">1</property>
-                        <property name="selection-mode">none</property>
-                        <property name="activate-on-single-click">0</property>
+                  <object class="GtkExpander">
+                    <property name="margin-start">4</property>
+                    <property name="margin-end">4</property>
+                    <property name="margin-bottom">4</property>
+                    <property name="expanded">1</property>
+                    <property name="vexpand">0</property>
+                    <property name="valign">start</property>
+                    <child>
+                      <object class="GtkScrolledWindow">
+                        <property name="vscrollbar-policy">never</property>
+                        <property name="propagate-natural-height">0</property>
+                        <property name="child">
+                          <object class="GtkFlowBox" id="artist_results">
+                            <property name="halign">start</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">0</property>
+                            <property name="valign">start</property>
+                            <property name="orientation">vertical</property>
+                            <property name="max-children-per-line">1</property>
+                            <property name="selection-mode">none</property>
+                            <property name="activate-on-single-click">0</property>
+                          </object>
+                        </property>
                       </object>
-                    </property>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes" comments="This is the title of a section of the search results">Artists</property>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes" comments="This is the title of a section of the search results">Artists</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
+          </object>
+        </child>
+        <child type="overlay">
+          <object class="AdwStatusPage" id="status_page">
+            <property name="title" translatable="yes" comments="Title for the empty search page (initial state).">Search Spotify.</property>
+            <property name="description" translatable="yes" comments="Subtitle for the empty search page (initial state).">Type to search.</property>
+            <property name="icon-name">system-search-symbolic</property>
+            <property name="visible">1</property>
           </object>
-        </property>
+        </child>
       </object>
     </child>
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/src/app/components/search/search_bar.rs b/src/app/components/search/search_bar.rs
deleted file mode 100644
index aab426db..00000000
--- a/src/app/components/search/search_bar.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use gtk::prelude::*;
-use std::rc::Rc;
-
-use super::SearchBarModel;
-use crate::app::components::EventListener;
-
-pub struct SearchBar;
-
-impl SearchBar {
-    pub fn new(
-        model: SearchBarModel,
-        search_button: gtk::ToggleButton,
-        search_bar: gtk::SearchBar,
-        search_entry: gtk::SearchEntry,
-    ) -> Self {
-        let model = Rc::new(model);
-
-        {
-            let model = model.clone();
-            search_entry.connect_changed(move |s| {
-                let query = s.text().as_str().to_string();
-                if !query.is_empty() {
-                    model.search(query);
-                }
-            });
-        }
-
-        let search_entry_controller = gtk::EventControllerFocus::new();
-        search_entry_controller.connect_enter(clone!(@weak search_entry => move |_| {
-            let query = search_entry.text().as_str().to_string();
-            if !query.is_empty() {
-                model.search(query);
-            }
-        }));
-        search_entry.add_controller(&search_entry_controller);
-
-        search_button.connect_clicked(clone!(@weak search_bar => move |b| {
-            search_bar.set_search_mode(b.is_active());
-        }));
-
-        search_bar.connect_search_mode_enabled_notify(clone!(@weak search_button => move |s| {
-            let active = s.is_search_mode();
-            if active != search_button.is_active() {
-                search_button.set_active(active);
-            }
-        }));
-
-        search_bar.connect_entry(&search_entry);
-
-        Self
-    }
-}
-
-impl EventListener for SearchBar {}
diff --git a/src/app/components/search/search_bar_model.rs b/src/app/components/search/search_bar_model.rs
deleted file mode 100644
index 2351c24e..00000000
--- a/src/app/components/search/search_bar_model.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use crate::app::{ActionDispatcher, BrowserAction};
-
-pub struct SearchBarModel(pub Box<dyn ActionDispatcher>);
-
-impl SearchBarModel {
-    pub fn search(&self, query: String) {
-        self.0.dispatch(BrowserAction::Search(query).into());
-    }
-}
diff --git a/src/app/components/search/search_button.rs b/src/app/components/search/search_button.rs
new file mode 100644
index 00000000..c320f7a9
--- /dev/null
+++ b/src/app/components/search/search_button.rs
@@ -0,0 +1,26 @@
+use gtk::prelude::*;
+
+use crate::app::components::EventListener;
+use crate::app::{ActionDispatcher, AppAction};
+
+pub struct SearchBarModel(pub Box<dyn ActionDispatcher>);
+
+impl SearchBarModel {
+    pub fn navigate_to_search(&self) {
+        self.0.dispatch(AppAction::ViewSearch());
+    }
+}
+
+pub struct SearchButton;
+
+impl SearchButton {
+    pub fn new(model: SearchBarModel, search_button: gtk::Button) -> Self {
+        search_button.connect_clicked(move |_| {
+            model.navigate_to_search();
+        });
+
+        Self
+    }
+}
+
+impl EventListener for SearchButton {}
diff --git a/src/app/components/search/search_model.rs b/src/app/components/search/search_model.rs
index 89d23a22..f8e36164 100644
--- a/src/app/components/search/search_model.rs
+++ b/src/app/components/search/search_model.rs
@@ -18,7 +18,17 @@ impl SearchResultsModel {
         }
     }
 
-    pub fn get_query(&self) -> Option<impl Deref<Target = String> + '_> {
+    pub fn go_back(&self) {
+        self.dispatcher
+            .dispatch(BrowserAction::NavigationPop.into());
+    }
+
+    pub fn search(&self, query: String) {
+        self.dispatcher
+            .dispatch(BrowserAction::Search(query).into());
+    }
+
+    fn get_query(&self) -> Option<impl Deref<Target = String> + '_> {
         self.app_model
             .map_state_opt(|s| Some(&s.browser.search_state()?.query))
     }
@@ -31,7 +41,7 @@ impl SearchResultsModel {
                 .call_spotify_and_dispatch(move || async move {
                     api.search(&query, 0, 5)
                         .await
-                        .map(|albums| BrowserAction::SetSearchResults(Box::new(albums)).into())
+                        .map(|results| BrowserAction::SetSearchResults(Box::new(results)).into())
                 });
         }
     }
diff --git a/src/app/components/selection/component.rs b/src/app/components/selection/component.rs
new file mode 100644
index 00000000..53feebe3
--- /dev/null
+++ b/src/app/components/selection/component.rs
@@ -0,0 +1,177 @@
+use gtk::prelude::*;
+use std::ops::Deref;
+use std::rc::Rc;
+
+use crate::app::components::{Component, EventListener};
+use crate::app::models::PlaylistSummary;
+use crate::app::state::{
+    LoginEvent, SelectionAction, SelectionContext, SelectionEvent, SelectionState,
+};
+use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, BrowserAction};
+
+use super::widget::{SelectionToolState, SelectionToolbarWidget};
+
+pub struct SelectionToolbarModel {
+    app_model: Rc<AppModel>,
+    dispatcher: Box<dyn ActionDispatcher>,
+}
+
+impl SelectionToolbarModel {
+    pub fn new(app_model: Rc<AppModel>, dispatcher: Box<dyn ActionDispatcher>) -> Self {
+        Self {
+            app_model,
+            dispatcher,
+        }
+    }
+
+    pub fn move_up_selection(&self) {
+        self.dispatcher.dispatch(AppAction::MoveUpSelection);
+    }
+
+    pub fn move_down_selection(&self) {
+        self.dispatcher.dispatch(AppAction::MoveDownSelection);
+    }
+
+    pub fn queue_selection(&self) {
+        self.dispatcher.dispatch(AppAction::QueueSelection);
+    }
+
+    fn dequeue_selection(&self) {
+        self.dispatcher.dispatch(AppAction::DequeueSelection);
+    }
+
+    pub fn remove_selection(&self) {
+        match &self.selection().context {
+            SelectionContext::Queue => self.dequeue_selection(),
+            SelectionContext::EditablePlaylist(id) => self.remove_from_playlist(id),
+            _ => {}
+        }
+    }
+
+    fn selection(&self) -> impl Deref<Target = SelectionState> + '_ {
+        self.app_model.map_state(|s| &s.selection)
+    }
+
+    fn selected_count(&self) -> usize {
+        self.selection().count()
+    }
+
+    fn user_playlists(&self) -> impl Deref<Target = Vec<PlaylistSummary>> + '_ {
+        self.app_model.map_state(|s| &s.logged_user.playlists)
+    }
+
+    fn add_to_playlist(&self, id: &str) {
+        let id = id.to_string();
+        let api = self.app_model.get_spotify();
+        let uris: Vec<String> = self
+            .selection()
+            .peek_selection()
+            .map(|s| &s.uri)
+            .cloned()
+            .collect();
+        self.dispatcher
+            .call_spotify_and_dispatch(move || async move {
+                api.add_to_playlist(&id, uris).await?;
+                Ok(SelectionAction::Clear.into())
+            })
+    }
+
+    fn remove_from_playlist(&self, id: &str) {
+        let api = self.app_model.get_spotify();
+        let id = id.to_string();
+        let uris: Vec<String> = self
+            .selection()
+            .peek_selection()
+            .map(|s| &s.uri)
+            .cloned()
+            .collect();
+        self.dispatcher
+            .call_spotify_and_dispatch_many(move || async move {
+                api.remove_from_playlist(&id, uris.clone()).await?;
+                Ok(vec![
+                    BrowserAction::RemoveTracksFromPlaylist(uris).into(),
+                    SelectionAction::Clear.into(),
+                ])
+            })
+    }
+}
+
+pub struct SelectionToolbar {
+    model: Rc<SelectionToolbarModel>,
+    widget: SelectionToolbarWidget,
+}
+
+impl SelectionToolbar {
+    pub fn new(model: SelectionToolbarModel, widget: SelectionToolbarWidget) -> Self {
+        let model = Rc::new(model);
+        widget.connect_move_up(clone!(@weak model => move || model.move_up_selection()));
+        widget.connect_move_down(clone!(@weak model => move || model.move_down_selection()));
+        widget.connect_queue(clone!(@weak model => move || model.queue_selection()));
+        widget.connect_remove(clone!(@weak model => move || model.remove_selection()));
+        Self { model, widget }
+    }
+
+    fn update_active_tools(&self) {
+        let count = self.model.selected_count();
+        match self.model.selection().context {
+            SelectionContext::Default => {
+                self.widget.set_move(SelectionToolState::Hidden);
+                self.widget
+                    .set_queue(SelectionToolState::Visible(count > 0));
+                self.widget.set_add(SelectionToolState::Visible(count > 0));
+                self.widget.set_remove(SelectionToolState::Hidden);
+            }
+            SelectionContext::Queue => {
+                self.widget
+                    .set_move(SelectionToolState::Visible(count == 1));
+                self.widget.set_queue(SelectionToolState::Hidden);
+                self.widget.set_add(SelectionToolState::Hidden);
+                self.widget
+                    .set_remove(SelectionToolState::Visible(count > 0));
+            }
+            SelectionContext::Playlist => {
+                self.widget.set_move(SelectionToolState::Hidden);
+                self.widget
+                    .set_queue(SelectionToolState::Visible(count > 0));
+                self.widget.set_add(SelectionToolState::Hidden);
+                self.widget.set_remove(SelectionToolState::Hidden);
+            }
+            SelectionContext::EditablePlaylist(_) => {
+                self.widget.set_move(SelectionToolState::Hidden);
+                self.widget
+                    .set_queue(SelectionToolState::Visible(count > 0));
+                self.widget.set_add(SelectionToolState::Hidden);
+                self.widget
+                    .set_remove(SelectionToolState::Visible(count > 0));
+            }
+        };
+    }
+}
+
+impl Component for SelectionToolbar {
+    fn get_root_widget(&self) -> &gtk::Widget {
+        self.widget.upcast_ref()
+    }
+}
+
+impl EventListener for SelectionToolbar {
+    fn on_event(&mut self, event: &AppEvent) {
+        match event {
+            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(active)) => {
+                self.widget.set_visible(*active);
+                self.update_active_tools();
+            }
+            AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
+                self.update_active_tools();
+            }
+            AppEvent::LoginEvent(LoginEvent::UserPlaylistsLoaded) => {
+                let model = &self.model;
+                self.widget.connect_playlists(
+                    &*model.user_playlists(),
+                    clone!(@weak model => move |s| model.add_to_playlist(s)),
+                );
+            }
+            _ => {}
+        }
+    }
+}
diff --git a/src/app/components/selection/icons/music-queue-symbolic.svg b/src/app/components/selection/icons/music-queue-symbolic.svg
new file mode 100644
index 00000000..1152a2dd
--- /dev/null
+++ b/src/app/components/selection/icons/music-queue-symbolic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#2e3436">
+        <path d="m 6.847656 2 c -1.007812 0 -1.847656 0.839844 -1.847656 1.84375 v 8.3125 c 0 1.003906 0.839844 1.84375 1.847656 1.84375 h 7.308594 c 1.003906 0 1.84375 -0.839844 1.84375 -1.84375 v -8.3125 c 0 -1.003906 -0.839844 -1.84375 -1.84375 -1.84375 z m 1.152344 3 h 1 c 0.199219 0 0.390625 0.058594 0.554688 0.167969 l 3 2 c 0.59375 0.394531 0.59375 1.269531 0 1.664062 l -3 2 c -0.164063 0.109375 -0.355469 0.167969 -0.554688 0.167969 h -1 z m 0 0"/>
+        <path d="m 4 2 c -1.089844 0 -2 0.910156 -2 2 v 8 c 0 1.089844 0.910156 2 2 2 z m 0 0"/>
+        <path d="m 1 2.28125 c -0.59375 0.351562 -1 0.992188 -1 1.71875 v 8 c 0 0.726562 0.40625 1.367188 1 1.71875 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/app/components/selection/icons/playlist2-symbolic.svg b/src/app/components/selection/icons/playlist2-symbolic.svg
new file mode 100644
index 00000000..3d820c07
--- /dev/null
+++ b/src/app/components/selection/icons/playlist2-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#2e3436">
+        <path d="m 3 3 v 2 h 10 v -2 z m 0 4 v 2 h 7.980469 v -2 z m 0 4 v 2 h 5.011719 l -0.011719 -2 z m 0 0"/>
+        <path d="m 12 7 v 3.269531 c -0.304688 -0.175781 -0.648438 -0.269531 -1 -0.269531 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 s 2 -0.894531 2 -2 v -3 h 2 v -2 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/app/components/selection/mod.rs b/src/app/components/selection/mod.rs
index d502cd68..a737bac7 100644
--- a/src/app/components/selection/mod.rs
+++ b/src/app/components/selection/mod.rs
@@ -1,8 +1,10 @@
-mod selection_heading;
-pub use selection_heading::*;
+mod widget;
 
-mod selection_tools;
-pub use selection_tools::*;
+mod component;
+pub use component::*;
 
-mod selection_widgets;
-pub use selection_widgets::*;
+use glib::prelude::*;
+
+pub fn expose_widgets() {
+    widget::SelectionToolbarWidget::static_type();
+}
diff --git a/src/app/components/selection/selection_heading.rs b/src/app/components/selection/selection_heading.rs
deleted file mode 100644
index b4694dbf..00000000
--- a/src/app/components/selection/selection_heading.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use gettextrs::*;
-use gtk::prelude::*;
-use std::rc::Rc;
-
-use crate::app::components::EventListener;
-use crate::app::state::{SelectionContext, SelectionEvent};
-use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, BrowserEvent};
-
-pub struct SelectionHeadingModel {
-    app_model: Rc<AppModel>,
-    dispatcher: Box<dyn ActionDispatcher>,
-}
-
-impl SelectionHeadingModel {
-    pub fn new(app_model: Rc<AppModel>, dispatcher: Box<dyn ActionDispatcher>) -> Self {
-        Self {
-            app_model,
-            dispatcher,
-        }
-    }
-
-    fn set_selection_mode(&self, active: bool) {
-        self.dispatcher
-            .dispatch(AppAction::ChangeSelectionMode(active))
-    }
-
-    fn selected_count(&self) -> usize {
-        self.app_model.get_state().selection.count()
-    }
-
-    fn should_change_context(&self) -> bool {
-        let state = self.app_model.get_state();
-        state.selection.context != SelectionContext::Global
-            && state.recommended_context() != state.selection.context
-    }
-}
-
-pub struct SelectionHeading {
-    model: Rc<SelectionHeadingModel>,
-    headerbar: libadwaita::HeaderBar,
-    selection_toggle: gtk::ToggleButton,
-    selection_label: gtk::Label,
-}
-
-impl SelectionHeading {
-    pub fn new(
-        model: SelectionHeadingModel,
-        headerbar: libadwaita::HeaderBar,
-        selection_toggle: gtk::ToggleButton,
-        selection_label: gtk::Label,
-    ) -> Self {
-        let model = Rc::new(model);
-
-        selection_toggle.connect_clicked(clone!(@weak model => move |t| {
-            model.set_selection_mode(t.is_active());
-        }));
-
-        Self {
-            model,
-            headerbar,
-            selection_toggle,
-            selection_label,
-        }
-    }
-
-    fn set_selection_active(&self, active: bool) {
-        let context = self.headerbar.style_context();
-        if active {
-            self.selection_label.show();
-            context.add_class("selection-mode");
-        } else {
-            self.selection_label.hide();
-            self.selection_label.set_label(&gettext("No song selected"));
-            context.remove_class("selection-mode");
-        }
-        if self.selection_toggle.is_active() != active {
-            self.selection_toggle.set_active(active);
-        }
-    }
-
-    fn update_selection_count(&self) {
-        let count = self.model.selected_count();
-        self.selection_label.set_label(&format!(
-            "{} {}",
-            count,
-            // translators: This is part of a larger text that says "<n> songs selected" when in selection mode. This text should be as short as possible.
-            ngettext("song selected", "songs selected", count as u32),
-        ));
-    }
-}
-
-impl EventListener for SelectionHeading {
-    fn on_event(&mut self, event: &AppEvent) {
-        match event {
-            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(active)) => {
-                self.set_selection_active(*active);
-            }
-            AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
-                self.update_selection_count();
-            }
-            // TODO: better navigation management so that we can reliably toggle some selection based on navigation
-            AppEvent::BrowserEvent(BrowserEvent::NavigationPushed(_))
-            | AppEvent::BrowserEvent(BrowserEvent::NavigationPoppedTo(_))
-            | AppEvent::BrowserEvent(BrowserEvent::NavigationPopped) => {
-                if self.model.should_change_context() {
-                    self.model.set_selection_mode(false);
-                }
-            }
-            _ => {}
-        }
-    }
-}
diff --git a/src/app/components/selection/selection_toolbar.css b/src/app/components/selection/selection_toolbar.css
new file mode 100644
index 00000000..71db7d0c
--- /dev/null
+++ b/src/app/components/selection/selection_toolbar.css
@@ -0,0 +1,3 @@
+.selection_toolbar {
+    background: @theme_bg_color;
+}
\ No newline at end of file
diff --git a/src/app/components/selection/selection_toolbar.ui b/src/app/components/selection/selection_toolbar.ui
new file mode 100644
index 00000000..3a058216
--- /dev/null
+++ b/src/app/components/selection/selection_toolbar.ui
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="SelectionToolbarWidget" parent="GtkBox">
+    <property name="hexpand">1</property>
+    <property name="visible">0</property>
+    <child>
+      <object class="GtkActionBar" id="action_bar">
+        <property name="hexpand">1</property>
+        <property name="revealed">1</property>
+        <child>
+          <object class="GtkBox">
+            <property name="valign">center</property>
+            <style>
+              <class name="linked" />
+            </style>
+            <child>
+              <object class="GtkButton" id="move_up">
+                <property name="icon-name">go-up-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="move_down">
+                <property name="icon-name">go-down-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkButton" id="queue">
+            <property name="valign">center</property>
+            <property name="has-frame">0</property>
+            <child>
+              <object class="AdwButtonContent">
+                <property name="icon-name">music-queue-symbolic</property>
+                <property name="label" translatable="yes">Add to queue</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkMenuButton" id="add">
+            <property name="valign">center</property>
+            <property name="has-frame">0</property>
+            <!-- <property name="icon-name">playlist2-symbolic</property> -->
+            <property name="label" translatable="yes">Add to playlist...</property>
+            <property name="direction">up</property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkButton" id="remove">
+            <property name="valign">center</property>
+            <property name="has-frame">0</property>
+            <child>
+              <object class="AdwButtonContent">
+                <property name="icon-name">user-trash-symbolic</property>
+                <property name="label" translatable="yes">Remove</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <style>
+      <class name="selection_toolbar" />
+    </style>
+  </template>
+</interface>
\ No newline at end of file
diff --git a/src/app/components/selection/selection_tools.rs b/src/app/components/selection/selection_tools.rs
deleted file mode 100644
index 6e5f0134..00000000
--- a/src/app/components/selection/selection_tools.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use crate::app::models::SongDescription;
-use crate::app::state::SelectionState;
-use crate::app::ActionDispatcher;
-use crate::app::{models::PlaylistSummary, state::SelectionAction};
-use crate::{api::SpotifyApiClient, app::AppAction};
-
-#[derive(Debug, Clone, Copy)]
-pub enum SimpleSelectionTool {
-    MoveUp,
-    MoveDown,
-    Remove,
-    SelectAll,
-}
-
-#[derive(Debug, Clone)]
-pub enum AddSelectionTool {
-    AddToQueue,
-    AddToPlaylist(PlaylistSummary),
-}
-
-#[derive(Debug, Clone)]
-pub enum SelectionTool {
-    Add(AddSelectionTool),
-    Simple(SimpleSelectionTool),
-}
-
-pub trait SelectionToolsModel {
-    // dependencies
-    fn dispatcher(&self) -> Box<dyn ActionDispatcher>;
-    fn spotify_client(&self) -> Arc<dyn SpotifyApiClient + Send + Sync>;
-
-    fn selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>>;
-    fn enabled_selection(&self) -> Option<Box<dyn Deref<Target = SelectionState> + '_>> {
-        self.selection().filter(|s| s.is_selection_enabled())
-    }
-
-    fn tools_visible(&self, selection: &SelectionState) -> Vec<SelectionTool>;
-
-    fn handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        self.default_handle_tool_activated(selection, tool)
-    }
-
-    fn default_handle_tool_activated(&self, selection: &SelectionState, tool: &SelectionTool) {
-        match tool {
-            SelectionTool::Add(AddSelectionTool::AddToPlaylist(playlist)) => {
-                self.handle_add_to_playlist_tool(selection, &playlist.id);
-            }
-            SelectionTool::Add(AddSelectionTool::AddToQueue) => {
-                self.dispatcher().dispatch(AppAction::QueueSelection);
-            }
-            _ => {}
-        }
-    }
-
-    // common tools implementations
-
-    fn handle_select_all_tool<'a>(&self, selection: &SelectionState, songs: &'a [SongDescription]) {
-        let all_selected = selection.all_selected(songs.iter().map(|s| &s.id));
-        let action = if all_selected {
-            SelectionAction::Deselect(songs.iter().map(|s| &s.id).cloned().collect())
-        } else {
-            SelectionAction::Select(songs.to_vec())
-        };
-        self.dispatcher().dispatch(action.into());
-    }
-
-    fn handle_select_all_tool_borrowed<'a>(
-        &self,
-        selection: &SelectionState,
-        songs: &'a [&'a SongDescription],
-    ) {
-        let all_selected = selection.all_selected(songs.iter().map(|s| &s.id));
-        let action = if all_selected {
-            SelectionAction::Deselect(songs.iter().map(|s| &s.id).cloned().collect())
-        } else {
-            SelectionAction::Select(songs.iter().map(|&s| s.clone()).collect())
-        };
-        self.dispatcher().dispatch(action.into());
-    }
-
-    fn handle_add_to_playlist_tool(&self, selection: &SelectionState, playlist: &str) {
-        let api = self.spotify_client();
-        let id = playlist.to_string();
-        let uris: Vec<String> = selection
-            .peek_selection()
-            .map(|s| &s.uri)
-            .cloned()
-            .collect();
-        self.dispatcher()
-            .call_spotify_and_dispatch(move || async move {
-                api.add_to_playlist(&id, uris).await?;
-                Ok(SelectionAction::Clear.into())
-            })
-    }
-}
diff --git a/src/app/components/selection/selection_widgets.rs b/src/app/components/selection/selection_widgets.rs
deleted file mode 100644
index 1be67d2a..00000000
--- a/src/app/components/selection/selection_widgets.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-use gio::{prelude::ActionMapExt, SimpleAction, SimpleActionGroup};
-use gtk::prelude::*;
-use std::rc::Rc;
-
-use crate::app::components::{labels, Component, EventListener, ListenerComponent};
-use crate::app::state::{SelectionEvent, SelectionState};
-use crate::app::AppEvent;
-
-use super::selection_tools::*;
-
-impl SimpleSelectionTool {
-    fn icon_name(&self) -> &'static str {
-        match self {
-            Self::MoveDown => "go-down-symbolic",
-            Self::MoveUp => "go-up-symbolic",
-            Self::Remove => "list-remove-symbolic",
-            Self::SelectAll => "checkbox-checked-symbolic",
-        }
-    }
-}
-
-trait SelectionWidget {
-    fn update_for_state(&self, selection: &SelectionState);
-}
-
-struct AddSelectionButton {
-    button: gtk::MenuButton,
-}
-
-impl AddSelectionButton {
-    fn new(tools: Vec<AddSelectionTool>, model: &Rc<impl SelectionToolsModel + 'static>) -> Self {
-        let button = gtk::MenuButtonBuilder::new()
-            .visible(true)
-            .icon_name("list-add-symbolic")
-            .build();
-        let ctx = button.style_context();
-        ctx.add_class("osd");
-        ctx.add_class("tool");
-
-        let action_group = SimpleActionGroup::new();
-        button.insert_action_group("add_to", Some(&action_group));
-
-        let menu = gio::Menu::new();
-        for tool in tools {
-            match tool {
-                AddSelectionTool::AddToPlaylist(desc) => {
-                    let action_name = format!("playlist_{}", &desc.id);
-                    let title = desc.title.clone();
-                    action_group.add_action(&{
-                        let queue = SimpleAction::new(&action_name, None);
-                        queue.connect_activate(clone!(@weak model => move |_, _| {
-                            let selection = model.enabled_selection();
-                            if let Some(selection) = selection {
-                                model.handle_tool_activated(&*selection, &SelectionTool::Add(AddSelectionTool::AddToPlaylist(desc.clone())));
-                            }
-                        }));
-                        queue
-                    });
-                    menu.append(
-                        // translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
-                        Some(&labels::add_to_playlist_label(&title)),
-                        Some(&format!("add_to.{}", action_name)),
-                    );
-                }
-                AddSelectionTool::AddToQueue => {
-                    action_group.add_action(&{
-                        let queue = SimpleAction::new("queue", None);
-                        queue.connect_activate(clone!(@weak model => move |_, _| {
-                            let selection = model.enabled_selection();
-                            if let Some(selection) = selection {
-                                model.handle_tool_activated(&*selection, &SelectionTool::Add(AddSelectionTool::AddToQueue));
-                            }
-                        }));
-                        queue
-                    });
-                    menu.append(Some(&labels::ADD_TO_QUEUE), Some("add_to.queue"));
-                }
-            }
-        }
-
-        let popover = gtk::PopoverMenu::from_model(Some(&menu));
-        popover.style_context().add_class("osd");
-        popover.set_position(gtk::PositionType::Top);
-        button.set_popover(Some(&popover));
-        gtk::MenuButton::set_direction(&button, gtk::ArrowType::Up);
-
-        Self { button }
-    }
-}
-
-impl SelectionWidget for AddSelectionButton {
-    fn update_for_state(&self, selection: &SelectionState) {
-        self.button.set_sensitive(selection.count() > 0);
-    }
-}
-
-struct SelectionButton {
-    button: gtk::Button,
-    tool: SimpleSelectionTool,
-}
-
-impl SelectionButton {
-    fn new(tool: SimpleSelectionTool, model: &Rc<impl SelectionToolsModel + 'static>) -> Self {
-        let button = gtk::ButtonBuilder::new()
-            .visible(true)
-            .icon_name(tool.icon_name())
-            .build();
-        let ctx = button.style_context();
-        ctx.add_class("osd");
-        ctx.add_class("tool");
-        button.connect_clicked(clone!(@weak model => move |_| {
-            let selection = model.enabled_selection();
-            if let Some(selection) = selection {
-                model.handle_tool_activated(&*selection, &SelectionTool::Simple(tool));
-            }
-        }));
-        Self { button, tool }
-    }
-}
-
-impl SelectionWidget for SelectionButton {
-    fn update_for_state(&self, selection: &SelectionState) {
-        self.button.set_sensitive(match self.tool {
-            SimpleSelectionTool::MoveUp | SimpleSelectionTool::MoveDown => selection.count() == 1,
-            SimpleSelectionTool::SelectAll => true,
-            _ => selection.count() > 0,
-        });
-    }
-}
-
-pub struct SelectionTools<Model> {
-    root: gtk::Widget,
-    button_box: gtk::Box,
-    children: Vec<Box<dyn EventListener>>,
-    selection_widgets: Vec<Box<dyn SelectionWidget>>,
-    model: Rc<Model>,
-}
-
-impl<Model> SelectionTools<Model>
-where
-    Model: SelectionToolsModel + 'static,
-{
-    pub fn new(wrapped: impl ListenerComponent + 'static, model: Rc<Model>) -> Self {
-        let (root, button_box) = Self::make_widgets(wrapped.get_root_widget());
-        let selection_widgets = Self::make_buttons(&button_box, &model);
-        Self {
-            root,
-            button_box,
-            children: vec![Box::new(wrapped)],
-            selection_widgets,
-            model,
-        }
-    }
-
-    fn update_active_tools(&self) {
-        if let Some(selection) = self.model.enabled_selection() {
-            for button in self.selection_widgets.iter() {
-                button.update_for_state(&*selection);
-            }
-        }
-    }
-
-    fn update_visible_tools(&mut self) {
-        self.selection_widgets = vec![];
-        while let Some(w) = self.button_box.first_child() {
-            self.button_box.remove(&w);
-        }
-
-        if self.model.enabled_selection().is_some() {
-            self.selection_widgets = Self::make_buttons(&self.button_box, &self.model);
-            self.button_box.show();
-        } else {
-            self.button_box.hide();
-        }
-    }
-
-    fn make_buttons(button_box: &gtk::Box, model: &Rc<Model>) -> Vec<Box<dyn SelectionWidget>> {
-        if let Some(selection) = model.enabled_selection() {
-            let all_tools = model.tools_visible(&*selection);
-            let mut other_tools: Vec<Box<dyn SelectionWidget>> = all_tools
-                .iter()
-                .filter_map(|t| match t {
-                    SelectionTool::Simple(tool) => Some({
-                        let button = SelectionButton::new(*tool, model);
-                        button.update_for_state(&*selection);
-                        button_box.append(&button.button);
-                        Box::new(button) as Box<dyn SelectionWidget>
-                    }),
-                    _ => None,
-                })
-                .collect();
-
-            let add_tools: Vec<AddSelectionTool> = all_tools
-                .into_iter()
-                .filter_map(|t| match t {
-                    SelectionTool::Add(tool) => Some(tool),
-                    _ => None,
-                })
-                .collect();
-            if !add_tools.is_empty() {
-                let button = AddSelectionButton::new(add_tools, model);
-                button.update_for_state(&*selection);
-                button_box.append(&button.button);
-                other_tools.push(Box::new(button));
-            }
-
-            other_tools
-        } else {
-            vec![]
-        }
-    }
-
-    fn make_button_box() -> gtk::Box {
-        let button_box = gtk::BoxBuilder::new()
-            .halign(gtk::Align::Center)
-            .valign(gtk::Align::End)
-            .margin_bottom(20)
-            .margin_top(20)
-            .margin_start(20)
-            .margin_end(20)
-            .build();
-        button_box.style_context().add_class("linked");
-        button_box
-    }
-
-    fn make_widgets(main_child: &gtk::Widget) -> (gtk::Widget, gtk::Box) {
-        let root = gtk::OverlayBuilder::new()
-            .hexpand(true)
-            .vexpand(true)
-            .build();
-        let button_box = Self::make_button_box();
-        root.set_child(Some(main_child));
-        root.add_overlay(&button_box);
-        (root.upcast(), button_box)
-    }
-}
-
-impl<Model> Component for SelectionTools<Model> {
-    fn get_root_widget(&self) -> &gtk::Widget {
-        &self.root
-    }
-
-    fn get_children(&mut self) -> Option<&mut Vec<Box<dyn EventListener>>> {
-        Some(&mut self.children)
-    }
-}
-
-impl<Model> EventListener for SelectionTools<Model>
-where
-    Model: SelectionToolsModel + 'static,
-{
-    fn on_event(&mut self, event: &AppEvent) {
-        match event {
-            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(_)) => {
-                self.update_visible_tools();
-            }
-            AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
-                self.update_active_tools();
-            }
-            _ => {}
-        }
-        self.broadcast_event(event);
-    }
-}
diff --git a/src/app/components/selection/widget.rs b/src/app/components/selection/widget.rs
new file mode 100644
index 00000000..5a93d6c0
--- /dev/null
+++ b/src/app/components/selection/widget.rs
@@ -0,0 +1,172 @@
+use gio::prelude::ActionMapExt;
+use gio::{SimpleAction, SimpleActionGroup};
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+
+use crate::app::components::{display_add_css_provider, labels};
+use crate::app::models::PlaylistSummary;
+
+mod imp {
+
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/dev/alextren/Spot/components/selection_toolbar.ui")]
+    pub struct SelectionToolbarWidget {
+        #[template_child]
+        pub action_bar: TemplateChild<gtk::ActionBar>,
+
+        #[template_child]
+        pub move_up: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub move_down: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub add: TemplateChild<gtk::MenuButton>,
+
+        #[template_child]
+        pub remove: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub queue: TemplateChild<gtk::Button>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SelectionToolbarWidget {
+        const NAME: &'static str = "SelectionToolbarWidget";
+        type Type = super::SelectionToolbarWidget;
+        type ParentType = gtk::Box;
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for SelectionToolbarWidget {
+        fn constructed(&self, obj: &Self::Type) {
+            self.parent_constructed(obj);
+            display_add_css_provider(resource!("/components/selection_toolbar.css"));
+        }
+    }
+
+    impl WidgetImpl for SelectionToolbarWidget {}
+    impl BoxImpl for SelectionToolbarWidget {}
+}
+
+glib::wrapper! {
+    pub struct SelectionToolbarWidget(ObjectSubclass<imp::SelectionToolbarWidget>) @extends gtk::Widget, gtk::Box;
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum SelectionToolState {
+    Hidden,
+    Visible(bool),
+}
+
+impl SelectionToolState {
+    fn visible(self) -> bool {
+        matches!(self, SelectionToolState::Visible(_))
+    }
+
+    fn sensitive(self) -> bool {
+        matches!(self, SelectionToolState::Visible(true))
+    }
+}
+
+impl SelectionToolbarWidget {
+    fn widget(&self) -> &imp::SelectionToolbarWidget {
+        imp::SelectionToolbarWidget::from_instance(self)
+    }
+
+    pub fn connect_move_down<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().move_down.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_move_up<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().move_up.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_queue<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().queue.connect_clicked(move |_| f());
+    }
+
+    pub fn connect_remove<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().remove.connect_clicked(move |_| f());
+    }
+
+    pub fn set_move(&self, state: SelectionToolState) {
+        self.widget().move_up.set_sensitive(state.sensitive());
+        self.widget().move_up.set_visible(state.visible());
+        self.widget().move_down.set_sensitive(state.sensitive());
+        self.widget().move_down.set_visible(state.visible());
+    }
+
+    pub fn set_queue(&self, state: SelectionToolState) {
+        self.widget().queue.set_sensitive(state.sensitive());
+        self.widget().queue.set_visible(state.visible());
+    }
+
+    pub fn set_add(&self, state: SelectionToolState) {
+        self.widget().add.set_sensitive(state.sensitive());
+        self.widget().add.set_visible(state.visible());
+    }
+
+    pub fn set_remove(&self, state: SelectionToolState) {
+        self.widget().remove.set_sensitive(state.sensitive());
+        self.widget().remove.set_visible(state.visible());
+    }
+
+    pub fn set_visible(&self, visible: bool) {
+        gtk::Widget::set_visible(self.upcast_ref(), visible);
+        self.widget().action_bar.set_revealed(visible);
+    }
+
+    pub fn connect_playlists<F>(&self, playlists: &[PlaylistSummary], on_playlist_selected: F)
+    where
+        F: Fn(&str) + Clone + 'static,
+    {
+        let menu = gio::Menu::new();
+        let action_group = SimpleActionGroup::new();
+
+        for PlaylistSummary { title, id } in playlists {
+            let action_name = format!("playlist_{}", &id);
+
+            action_group.add_action(&{
+                let id = id.clone();
+                let action = SimpleAction::new(&action_name, None);
+                let f = on_playlist_selected.clone();
+                action.connect_activate(move |_, _| f(&id));
+                action
+            });
+
+            menu.append(
+                Some(&labels::add_to_playlist_label(title)),
+                Some(&format!("add_to.{}", action_name)),
+            );
+        }
+
+        let popover = gtk::PopoverMenu::from_model(Some(&menu));
+        self.widget().add.set_popover(Some(&popover));
+        self.widget()
+            .add
+            .insert_action_group("add_to", Some(&action_group));
+    }
+}
diff --git a/src/app/components/sidebar_listbox/icons/library-music-symbolic.svg b/src/app/components/sidebar_listbox/icons/library-music-symbolic.svg
new file mode 100644
index 00000000..0ef4ce10
--- /dev/null
+++ b/src/app/components/sidebar_listbox/icons/library-music-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#2e3436">
+        <path d="m 5 0 c -1.089844 0 -2 0.910156 -2 2 v 9 c 0 1.089844 0.910156 2 2 2 h 9 c 1.089844 0 2 -0.910156 2 -2 v -9 c 0 -1.089844 -0.910156 -2 -2 -2 z m 8 2 v 2 h -2 v 5 c 0 1.105469 -0.894531 2 -2 2 s -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 c 0.351562 0 0.695312 0.09375 1 0.269531 v -5.269531 z m 0 0"/>
+        <path d="m 2 3 c -1.089844 0 -2 0.910156 -2 2 v 9 c 0 1.089844 0.910156 2 2 2 h 9 c 1.089844 0 2 -0.910156 2 -2 h -11 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/app/components/sidebar_listbox/mod.rs b/src/app/components/sidebar_listbox/mod.rs
new file mode 100644
index 00000000..960fe346
--- /dev/null
+++ b/src/app/components/sidebar_listbox/mod.rs
@@ -0,0 +1,22 @@
+mod sidebar_icon_widget;
+mod sidebar_item;
+mod sidebar_row;
+
+use crate::app::components::display_add_css_provider;
+use gtk::prelude::*;
+use gtk::ListBox;
+pub use sidebar_item::*;
+pub use sidebar_row::*;
+
+pub fn build_sidebar_listbox(builder: &gtk::Builder, list_store: &gio::ListStore) -> ListBox {
+    display_add_css_provider(resource!("/sidebar_listbox/sidebar.css"));
+    let listbox: gtk::ListBox = builder.object("home_listbox").unwrap();
+    listbox.bind_model(Some(list_store), move |obj| {
+        let item = obj.downcast_ref::<sidebar_item::SideBarItem>().unwrap();
+        let row = SideBarRow::new(item);
+        row.upcast::<gtk::Widget>()
+    });
+    listbox.add_css_class("navigation-sidebar");
+    listbox.add_css_class("listbox_sidebar");
+    listbox
+}
diff --git a/src/app/components/sidebar_listbox/sidebar.css b/src/app/components/sidebar_listbox/sidebar.css
new file mode 100644
index 00000000..bab390e3
--- /dev/null
+++ b/src/app/components/sidebar_listbox/sidebar.css
@@ -0,0 +1,7 @@
+.item_sidebar {
+    margin: 12px 6px;
+}
+
+.listbox_sidebar {
+    background-color: @view_bg_color;
+}
\ No newline at end of file
diff --git a/src/app/components/sidebar_listbox/sidebar_icon_widget.rs b/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
new file mode 100644
index 00000000..0a925f41
--- /dev/null
+++ b/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
@@ -0,0 +1,56 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+
+mod imp {
+
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/dev/alextren/Spot/sidebar_listbox/sidebar_icon_widget.ui")]
+    pub struct SideBarItemWidgetIcon {
+        #[template_child]
+        pub icon: TemplateChild<gtk::Image>,
+
+        #[template_child]
+        pub title: TemplateChild<gtk::Label>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SideBarItemWidgetIcon {
+        const NAME: &'static str = "SideBarItemWidgetIcon";
+        type Type = super::SideBarItemWidgetIcon;
+        type ParentType = gtk::Box;
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for SideBarItemWidgetIcon {}
+    impl WidgetImpl for SideBarItemWidgetIcon {}
+    impl BoxImpl for SideBarItemWidgetIcon {}
+}
+
+glib::wrapper! {
+    pub struct SideBarItemWidgetIcon(ObjectSubclass<imp::SideBarItemWidgetIcon>) @extends gtk::Widget, gtk::Box;
+}
+
+impl SideBarItemWidgetIcon {
+    pub fn new(title: &str, iconname: Option<&str>) -> Self {
+        let s: SideBarItemWidgetIcon =
+            glib::Object::new(&[]).expect("Failed to create an instance of SideBarItemWidgetIcon");
+        s.widget().title.set_text(title);
+        s.widget().icon.set_icon_name(iconname);
+        s.set_tooltip_text(Option::from(title));
+        s
+    }
+
+    pub fn widget(&self) -> &imp::SideBarItemWidgetIcon {
+        imp::SideBarItemWidgetIcon::from_instance(self)
+    }
+}
diff --git a/src/app/components/sidebar_listbox/sidebar_icon_widget.ui b/src/app/components/sidebar_listbox/sidebar_icon_widget.ui
new file mode 100644
index 00000000..cdab7115
--- /dev/null
+++ b/src/app/components/sidebar_listbox/sidebar_icon_widget.ui
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="SideBarItemWidgetIcon" parent="GtkBox">
+    <property name="visible">True</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkImage" id="icon">
+          <style>
+              <class name="item_sidebar"/>
+          </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="title">
+          <property name="width-chars">20</property>
+          <property name="ellipsize">end</property>
+          <property name="xalign">0</property>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/app/components/sidebar_listbox/sidebar_item.rs b/src/app/components/sidebar_listbox/sidebar_item.rs
new file mode 100644
index 00000000..a22d30a0
--- /dev/null
+++ b/src/app/components/sidebar_listbox/sidebar_item.rs
@@ -0,0 +1,149 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+
+impl SideBarItem {
+    pub fn new(id: &str, title: &str, iconname: &str, grayedout: bool) -> SideBarItem {
+        glib::Object::new::<SideBarItem>(&[
+            ("id", &id),
+            ("title", &title),
+            ("iconname", &iconname),
+            ("grayedout", &grayedout),
+        ])
+        .expect("Failed to create")
+    }
+
+    pub(crate) fn id(&self) -> String {
+        self.property("id")
+            .unwrap()
+            .get::<&str>()
+            .unwrap()
+            .to_string()
+    }
+
+    pub(crate) fn title(&self) -> String {
+        self.property("title")
+            .unwrap()
+            .get::<&str>()
+            .unwrap()
+            .to_string()
+    }
+
+    pub(crate) fn iconname(&self) -> String {
+        self.property("iconname")
+            .unwrap()
+            .get::<&str>()
+            .unwrap()
+            .to_string()
+    }
+
+    pub(crate) fn grayedout(&self) -> bool {
+        self.property("grayedout").unwrap().get::<bool>().unwrap()
+    }
+}
+
+mod imp {
+    use super::*;
+    use gdk::cairo::glib::ParamSpec;
+    use std::cell::RefCell;
+
+    #[derive(Debug, Default)]
+    pub struct SideBarItem {
+        pub id: RefCell<Option<String>>,
+        pub title: RefCell<Option<String>>,
+        pub iconname: RefCell<Option<String>>,
+        pub grayedout: RefCell<bool>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SideBarItem {
+        const NAME: &'static str = "SideBarItem";
+        type Type = super::SideBarItem;
+        type ParentType = glib::Object;
+
+        fn new() -> Self {
+            Self {
+                id: RefCell::new(None),
+                title: RefCell::new(None),
+                iconname: RefCell::new(None),
+                grayedout: RefCell::new(false),
+            }
+        }
+    }
+
+    lazy_static! {
+        static ref PROPERTIES: [glib::ParamSpec; 4] = [
+            glib::ParamSpec::new_string("id", "ID", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpec::new_string("title", "Title", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpec::new_string(
+                "iconname",
+                "IconName",
+                "",
+                None,
+                glib::ParamFlags::READWRITE
+            ),
+            glib::ParamSpec::new_boolean(
+                "grayedout",
+                "GrayedOut",
+                "",
+                false,
+                glib::ParamFlags::READWRITE
+            ),
+        ];
+    }
+
+    impl ObjectImpl for SideBarItem {
+        fn properties() -> &'static [ParamSpec] {
+            &*PROPERTIES
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "id" => {
+                    let id = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.id.replace(id);
+                }
+                "title" => {
+                    let title = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.title.replace(title);
+                }
+                "iconname" => {
+                    let iconname = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.iconname.replace(iconname);
+                }
+                "grayedout" => {
+                    let grayedout = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.grayedout.replace(grayedout);
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "id" => self.id.borrow().to_value(),
+                "title" => self.title.borrow().to_value(),
+                "iconname" => self.iconname.borrow().to_value(),
+                "grayedout" => self.grayedout.borrow().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+    }
+}
+
+glib::wrapper! {
+    pub struct SideBarItem(ObjectSubclass<imp::SideBarItem>);
+}
diff --git a/src/app/components/sidebar_listbox/sidebar_row.rs b/src/app/components/sidebar_listbox/sidebar_row.rs
new file mode 100644
index 00000000..888d9992
--- /dev/null
+++ b/src/app/components/sidebar_listbox/sidebar_row.rs
@@ -0,0 +1,110 @@
+use crate::app::components::display_add_css_provider;
+use crate::app::components::sidebar_listbox::sidebar_icon_widget::SideBarItemWidgetIcon;
+use crate::app::components::sidebar_listbox::SideBarItem;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+
+impl SideBarRow {
+    pub fn new(item: &SideBarItem) -> SideBarRow {
+        display_add_css_provider(resource!("/sidebar_listbox/sidebar.css"));
+        let id = item.id();
+        let t = item.title();
+        let row =
+            glib::Object::new::<SideBarRow>(&[("id", &id.as_str())]).expect("Failed to create");
+        if item.grayedout() {
+            let label = gtk::Label::new(Option::from(t.as_str()));
+            let gtk_box = gtk::Box::new(gtk::Orientation::Horizontal, 12);
+            gtk_box.append(&label);
+            row.set_child(Option::from(&gtk_box));
+            row.set_activatable(false);
+            row.set_selectable(false);
+            row.set_sensitive(false);
+            label.add_css_class("caption-heading");
+            label.add_css_class("item_sidebar");
+        } else {
+            let widget = SideBarItemWidgetIcon::new(t.as_str(), Some(item.iconname().as_str()));
+            row.set_child(Option::from(&widget));
+        }
+        row
+    }
+
+    pub fn id(&self) -> String {
+        self.property("id")
+            .unwrap()
+            .get::<&str>()
+            .unwrap()
+            .to_string()
+    }
+}
+
+mod imp {
+    use super::*;
+    use gdk::cairo::glib::ParamSpec;
+    use std::cell::RefCell;
+
+    #[derive(Debug, Default)]
+    pub struct SideBarRow {
+        pub id: RefCell<Option<String>>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SideBarRow {
+        const NAME: &'static str = "SideBarRow";
+        type Type = super::SideBarRow;
+        type ParentType = gtk::ListBoxRow;
+
+        fn new() -> Self {
+            Self {
+                id: RefCell::new(None),
+            }
+        }
+    }
+
+    lazy_static! {
+        static ref PROPERTIES: [glib::ParamSpec; 1] = [glib::ParamSpec::new_string(
+            "id",
+            "ID",
+            "",
+            None,
+            glib::ParamFlags::READWRITE
+        ),];
+    }
+
+    impl ObjectImpl for SideBarRow {
+        fn properties() -> &'static [ParamSpec] {
+            &*PROPERTIES
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "id" => {
+                    let id = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.id.replace(id);
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "id" => self.id.borrow().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+    }
+
+    impl WidgetImpl for SideBarRow {}
+
+    impl ListBoxRowImpl for SideBarRow {}
+}
+glib::wrapper! {
+    pub struct SideBarRow(ObjectSubclass<imp::SideBarRow>) @extends gtk::Widget, gtk::ListBoxRow;
+}
diff --git a/src/app/components/utils.rs b/src/app/components/utils.rs
index 84b2fe4d..15e20561 100644
--- a/src/app/components/utils.rs
+++ b/src/app/components/utils.rs
@@ -145,8 +145,8 @@ pub fn format_duration(duration: f64) -> String {
     let minutes = seconds.div_euclid(60).rem_euclid(60);
     let seconds = seconds.rem_euclid(60);
     if hours > 0 {
-        format!("{}:{:02}:{:02}", hours, minutes, seconds)
+        format!("{}∶{:02}∶{:02}", hours, minutes, seconds)
     } else {
-        format!("{}:{:02}", minutes, seconds)
+        format!("{}∶{:02}", minutes, seconds)
     }
 }
diff --git a/src/app/components/window/mod.rs b/src/app/components/window/mod.rs
index fb185cd2..4c3b53f1 100644
--- a/src/app/components/window/mod.rs
+++ b/src/app/components/window/mod.rs
@@ -22,7 +22,6 @@ impl MainWindow {
         initial_window_geometry: WindowGeometry,
         app_model: Rc<AppModel>,
         window: libadwaita::ApplicationWindow,
-        search_bar: gtk::SearchBar,
     ) -> Self {
         window.connect_close_request(
             clone!(@weak app_model => @default-return gtk::Inhibit(false), move |window| {
@@ -36,21 +35,6 @@ impl MainWindow {
             }),
         );
 
-        let window_controller = gtk::EventControllerKey::new();
-        window.add_controller(&window_controller);
-        window_controller.set_propagation_phase(gtk::PropagationPhase::Bubble);
-        window_controller.connect_key_pressed(clone!(@weak search_bar, @weak window => @default-return gtk::Inhibit(false), move |controller, _, _, _| {
-            let search_triggered = controller.forward(&search_bar) || search_bar.is_search_mode();
-            if search_triggered {
-                search_bar.set_search_mode(true);
-                gtk::Inhibit(true)
-            } else if let Some(child) = window.first_child().as_ref() {
-                gtk::Inhibit(controller.forward(child))
-            } else {
-                gtk::Inhibit(false)
-            }
-        }));
-
         window.connect_default_height_notify(Self::save_window_geometry);
         window.connect_default_width_notify(Self::save_window_geometry);
         window.connect_maximized_notify(Self::save_window_geometry);
diff --git a/src/app/mod.rs b/src/app/mod.rs
index ae17b09d..d635e5c9 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -1,4 +1,6 @@
 use crate::api::CachedSpotifyClient;
+use crate::app::components::sidebar_listbox::{build_sidebar_listbox, SideBarItem};
+use crate::glib::StaticType;
 use crate::settings::SpotSettings;
 use futures::channel::mpsc::UnboundedSender;
 use std::rc::Rc;
@@ -71,7 +73,7 @@ impl App {
 
         let mut components: Vec<Box<dyn EventListener>> = vec![
             App::make_window(&self.settings, builder, Rc::clone(model)),
-            App::make_selection_editor(builder, Rc::clone(model), dispatcher.box_clone()),
+            App::make_selection_toolbar(builder, Rc::clone(model), dispatcher.box_clone()),
             App::make_playback(
                 builder,
                 Rc::clone(model),
@@ -85,7 +87,7 @@ impl App {
                 dispatcher.box_clone(),
                 worker.clone(),
             ),
-            App::make_search_bar(builder, dispatcher.box_clone()),
+            App::make_search_button(builder, dispatcher.box_clone()),
             App::make_user_menu(builder, Rc::clone(model), dispatcher.box_clone()),
             App::make_notification(builder, dispatcher),
         ];
@@ -116,30 +118,7 @@ impl App {
         app_model: Rc<AppModel>,
     ) -> Box<impl EventListener> {
         let window: libadwaita::ApplicationWindow = builder.object("window").unwrap();
-        let search_bar: gtk::SearchBar = builder.object("search_bar").unwrap();
-        Box::new(MainWindow::new(
-            settings.window.clone(),
-            app_model,
-            window,
-            search_bar,
-        ))
-    }
-
-    fn make_selection_editor(
-        builder: &gtk::Builder,
-        app_model: Rc<AppModel>,
-        dispatcher: Box<dyn ActionDispatcher>,
-    ) -> Box<impl EventListener> {
-        let headerbar: libadwaita::HeaderBar = builder.object("header_bar").unwrap();
-        let selection_toggle: gtk::ToggleButton = builder.object("selection_toggle").unwrap();
-        let selection_label: gtk::Label = builder.object("selection_label").unwrap();
-        let model = SelectionHeadingModel::new(app_model, dispatcher);
-        Box::new(SelectionHeading::new(
-            model,
-            headerbar,
-            selection_toggle,
-            selection_label,
-        ))
+        Box::new(MainWindow::new(settings.window.clone(), app_model, window))
     }
 
     fn make_navigation(
@@ -148,20 +127,19 @@ impl App {
         dispatcher: Box<dyn ActionDispatcher>,
         worker: Worker,
     ) -> Box<Navigation> {
-        let back_btn: gtk::Button = builder.object("nav_back").unwrap();
         let leaflet: libadwaita::Leaflet = builder.object("leaflet").unwrap();
         let navigation_stack: gtk::Stack = builder.object("navigation_stack").unwrap();
-        let home_stack_sidebar: gtk::StackSidebar = builder.object("home_stack_sidebar").unwrap();
-
+        let home_list_store = gio::ListStore::new(SideBarItem::static_type());
+        let home_listbox = build_sidebar_listbox(builder, &home_list_store);
         let model = NavigationModel::new(Rc::clone(&app_model), dispatcher.box_clone());
         let screen_factory =
             ScreenFactory::new(Rc::clone(&app_model), dispatcher.box_clone(), worker);
         Box::new(Navigation::new(
             model,
             leaflet,
-            back_btn,
             navigation_stack,
-            home_stack_sidebar,
+            home_listbox,
+            home_list_store,
             screen_factory,
         ))
     }
@@ -172,6 +150,17 @@ impl App {
         Box::new(Login::new(parent, model))
     }
 
+    fn make_selection_toolbar(
+        builder: &gtk::Builder,
+        app_model: Rc<AppModel>,
+        dispatcher: Box<dyn ActionDispatcher>,
+    ) -> Box<impl EventListener> {
+        Box::new(SelectionToolbar::new(
+            SelectionToolbarModel::new(app_model, dispatcher),
+            builder.object("selection_toolbar").unwrap(),
+        ))
+    }
+
     fn make_playback(
         builder: &gtk::Builder,
         app_model: Rc<AppModel>,
@@ -186,20 +175,13 @@ impl App {
         ))
     }
 
-    fn make_search_bar(
+    fn make_search_button(
         builder: &gtk::Builder,
         dispatcher: Box<dyn ActionDispatcher>,
-    ) -> Box<SearchBar> {
-        let search_button: gtk::ToggleButton = builder.object("search_button").unwrap();
-        let search_entry: gtk::SearchEntry = builder.object("search_entry").unwrap();
-        let search_bar: gtk::SearchBar = builder.object("search_bar").unwrap();
+    ) -> Box<SearchButton> {
+        let search_button: gtk::Button = builder.object("search_button").unwrap();
         let model = SearchBarModel(dispatcher);
-        Box::new(SearchBar::new(
-            model,
-            search_button,
-            search_bar,
-            search_entry,
-        ))
+        Box::new(SearchButton::new(model, search_button))
     }
 
     fn make_user_menu(
diff --git a/src/app/models/core.rs b/src/app/models/core.rs
index 265990f1..9e3d6fac 100644
--- a/src/app/models/core.rs
+++ b/src/app/models/core.rs
@@ -228,7 +228,7 @@ impl SongList {
         if a == b {
             return;
         }
-        let a_value = self.index_mut(a).map(|v| std::mem::take(v));
+        let a_value = self.index_mut(a).map(std::mem::take);
         let a_value = a_value.as_ref();
         let new_a_value = self
             .index_mut(b)
@@ -334,7 +334,7 @@ mod tests {
             },
             duration: 1000,
             art: None,
-            track_number: 0,
+            track_number: None,
         }
     }
 
diff --git a/src/app/models/gtypes/album_model.rs b/src/app/models/gtypes/album_model.rs
index 336818b6..807a1e13 100644
--- a/src/app/models/gtypes/album_model.rs
+++ b/src/app/models/gtypes/album_model.rs
@@ -10,16 +10,31 @@ glib::wrapper! {
 // Constructor for new instances. This simply calls glib::Object::new() with
 // initial values for our two properties and then returns the new instance
 impl AlbumModel {
-    pub fn new(artist: &str, album: &str, cover: &Option<String>, uri: &str) -> AlbumModel {
+    pub fn new(
+        artist: &str,
+        album: &str,
+        year: Option<u32>,
+        cover: &Option<String>,
+        uri: &str,
+    ) -> AlbumModel {
+        let year = year.unwrap_or(0);
         glib::Object::new::<AlbumModel>(&[
             ("artist", &artist),
             ("album", &album),
+            ("year", &year),
             ("cover", cover),
             ("uri", &uri),
         ])
         .expect("Failed to create")
     }
 
+    pub fn year(&self) -> Option<u32> {
+        match self.property("year").unwrap().get::<u32>().unwrap() {
+            0 => None,
+            year => Some(year),
+        }
+    }
+
     pub fn cover_url(&self) -> Option<String> {
         self.property("cover")
             .unwrap()
@@ -35,6 +50,14 @@ impl AlbumModel {
             .ok()
             .map(|s| s.to_string())
     }
+
+    pub fn album_title(&self) -> Option<String> {
+        self.property("album")
+            .unwrap()
+            .get::<&str>()
+            .ok()
+            .map(|s| s.to_string())
+    }
 }
 
 mod imp {
@@ -45,9 +68,10 @@ mod imp {
 
     // Static array for defining the properties of the new type.
     lazy_static! {
-        static ref PROPERTIES: [glib::ParamSpec; 4] = [
+        static ref PROPERTIES: [glib::ParamSpec; 5] = [
             glib::ParamSpec::new_string("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
             glib::ParamSpec::new_string("album", "Album", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpec::new_uint("year", "Year", "", 0, 9999, 0, glib::ParamFlags::READWRITE),
             glib::ParamSpec::new_string("cover", "Cover", "", None, glib::ParamFlags::READWRITE),
             glib::ParamSpec::new_string("uri", "URI", "", None, glib::ParamFlags::READWRITE),
         ];
@@ -59,6 +83,7 @@ mod imp {
     pub struct AlbumModel {
         album: RefCell<Option<String>>,
         artist: RefCell<Option<String>>,
+        year: RefCell<Option<u32>>,
         cover: RefCell<Option<String>>,
         uri: RefCell<Option<String>>,
     }
@@ -85,6 +110,7 @@ mod imp {
             Self {
                 album: RefCell::new(None),
                 artist: RefCell::new(None),
+                year: RefCell::new(None),
                 cover: RefCell::new(None),
                 uri: RefCell::new(None),
             }
@@ -119,6 +145,15 @@ mod imp {
                         .expect("type conformity checked by `Object::set_property`");
                     self.artist.replace(artist);
                 }
+                "year" => {
+                    let year = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    match year {
+                        0 => self.year.replace(None),
+                        y => self.year.replace(Some(y)),
+                    };
+                }
                 "cover" => {
                     let cover = value
                         .get()
@@ -141,6 +176,7 @@ mod imp {
             match pspec.name() {
                 "album" => self.album.borrow().to_value(),
                 "artist" => self.artist.borrow().to_value(),
+                "year" => self.year.borrow().unwrap_or(0).to_value(),
                 "cover" => self.cover.borrow().to_value(),
                 "uri" => self.uri.borrow().to_value(),
                 _ => unimplemented!(),
diff --git a/src/app/models/gtypes/song_model.rs b/src/app/models/gtypes/song_model.rs
index 5d69fe27..3fa29288 100644
--- a/src/app/models/gtypes/song_model.rs
+++ b/src/app/models/gtypes/song_model.rs
@@ -10,17 +10,33 @@ glib::wrapper! {
 // Constructor for new instances. This simply calls glib::Object::new() with
 // initial values for our two properties and then returns the new instance
 impl SongModel {
-    pub fn new(id: &str, index: u32, title: &str, artist: &str, duration: &str) -> SongModel {
+    pub fn new(
+        id: &str,
+        index: u32,
+        title: &str,
+        artist: &str,
+        duration: &str,
+        art: &Option<String>,
+    ) -> SongModel {
         glib::Object::new::<SongModel>(&[
             ("index", &index),
             ("title", &title),
             ("artist", &artist),
             ("id", &id),
             ("duration", &duration),
+            ("art", &art),
         ])
         .expect("Failed to create")
     }
 
+    pub fn cover_url(&self) -> Option<String> {
+        self.property("art")
+            .unwrap()
+            .get::<&str>()
+            .ok()
+            .map(|s| s.to_string())
+    }
+
     pub fn set_playing(&self, is_playing: bool) {
         self.set_property("playing", is_playing)
             .expect("set 'playing' failed");
@@ -128,6 +144,7 @@ mod imp {
         title: RefCell<Option<String>>,
         artist: RefCell<Option<String>>,
         duration: RefCell<Option<String>>,
+        art: RefCell<Option<String>>,
         playing: RefCell<bool>,
         selected: RefCell<bool>,
         bindings: RefCell<BindingsInner>,
@@ -176,6 +193,7 @@ mod imp {
                 title: RefCell::new(None),
                 artist: RefCell::new(None),
                 duration: RefCell::new(None),
+                art: RefCell::new(None),
                 playing: RefCell::new(false),
                 selected: RefCell::new(false),
                 bindings: RefCell::new(Default::default()),
@@ -185,7 +203,7 @@ mod imp {
 
     // Static array for defining the properties of the new type.
     lazy_static! {
-        static ref PROPERTIES: [glib::ParamSpec; 7] = [
+        static ref PROPERTIES: [glib::ParamSpec; 8] = [
             glib::ParamSpec::new_uint(
                 "index",
                 "Index",
@@ -219,6 +237,7 @@ mod imp {
                 false,
                 glib::ParamFlags::READWRITE,
             ),
+            glib::ParamSpec::new_string("art", "Art", "", None, glib::ParamFlags::READWRITE,),
         ];
     }
 
@@ -268,6 +287,12 @@ mod imp {
                         .expect("type conformity checked by `Object::set_property`");
                     self.duration.replace(dur);
                 }
+                "art" => {
+                    let art = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.art.replace(art);
+                }
                 "playing" => {
                     let playing = value
                         .get()
@@ -293,6 +318,7 @@ mod imp {
                 "artist" => self.artist.borrow().to_value(),
                 "id" => self.id.borrow().to_value(),
                 "duration" => self.duration.borrow().to_value(),
+                "art" => self.art.borrow().to_value(),
                 "playing" => self.playing.borrow().to_value(),
                 "selected" => self.selected.borrow().to_value(),
                 _ => unimplemented!(),
diff --git a/src/app/models/main.rs b/src/app/models/main.rs
index b183bc2d..f8c7e216 100644
--- a/src/app/models/main.rs
+++ b/src/app/models/main.rs
@@ -1,4 +1,5 @@
 use std::convert::From;
+use std::str::FromStr;
 
 use super::core::{Batch, SongList};
 use super::gtypes::*;
@@ -7,7 +8,13 @@ use crate::app::components::utils::format_duration;
 
 impl From<&AlbumDescription> for AlbumModel {
     fn from(album: &AlbumDescription) -> Self {
-        AlbumModel::new(&album.artists_name(), &album.title, &album.art, &album.id)
+        AlbumModel::new(
+            &album.artists_name(),
+            &album.title,
+            album.year(),
+            &album.art,
+            &album.id,
+        )
     }
 }
 
@@ -22,6 +29,8 @@ impl From<&PlaylistDescription> for AlbumModel {
         AlbumModel::new(
             &playlist.owner.display_name,
             &playlist.title,
+            // Playlists do not have their released date since they are expected to be updated anytime.
+            None,
             &playlist.art,
             &playlist.id,
         )
@@ -38,10 +47,11 @@ impl From<&SongDescription> for SongModel {
     fn from(song: &SongDescription) -> Self {
         SongModel::new(
             &song.id,
-            song.track_number,
+            song.track_number.unwrap_or(1),
             &song.title,
             &song.artists_name(),
             &format_duration(song.duration.into()),
+            &song.art,
         )
     }
 }
@@ -81,6 +91,7 @@ pub struct AlbumDescription {
     pub id: String,
     pub title: String,
     pub artists: Vec<ArtistRef>,
+    pub release_date: Option<String>,
     pub art: Option<String>,
     pub songs: SongList,
     pub is_liked: bool,
@@ -94,10 +105,18 @@ impl AlbumDescription {
             .collect::<Vec<String>>()
             .join(", ")
     }
+
     pub fn formatted_time(&self) -> String {
         let duration: u32 = self.songs.iter().map(|song| song.duration).sum();
         format_duration(duration.into())
     }
+
+    pub fn year(&self) -> Option<u32> {
+        self.release_date
+            .as_ref()
+            .and_then(|date| date.split('-').next())
+            .and_then(|y| u32::from_str(y).ok())
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -109,7 +128,6 @@ pub struct AlbumFullDescription {
 #[derive(Clone, Debug)]
 pub struct AlbumReleaseDetails {
     pub label: String,
-    pub release_date: String,
     pub copyright_text: String,
 }
 
@@ -131,7 +149,7 @@ pub struct PlaylistSummary {
 #[derive(Clone, Debug)]
 pub struct SongDescription {
     pub id: String,
-    pub track_number: u32,
+    pub track_number: Option<u32>,
     pub uri: String,
     pub title: String,
     pub artists: Vec<ArtistRef>,
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 7777a38d..6b219021 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -22,7 +22,8 @@ pub enum AppAction {
     DequeueSelection,
     MoveUpSelection,
     MoveDownSelection,
-    ChangeSelectionMode(bool),
+    EnableSelection(SelectionContext),
+    CancelSelection,
 }
 
 impl AppAction {
@@ -45,6 +46,11 @@ impl AppAction {
     pub fn ViewUser(id: String) -> Self {
         BrowserAction::NavigationPush(ScreenName::User(id)).into()
     }
+
+    #[allow(non_snake_case)]
+    pub fn ViewSearch() -> Self {
+        BrowserAction::NavigationPush(ScreenName::Search).into()
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -77,15 +83,6 @@ impl AppState {
         }
     }
 
-    pub fn recommended_context(&self) -> SelectionContext {
-        match self.browser.current_screen() {
-            ScreenName::PlaylistDetails(_) => SelectionContext::Playlist,
-            // TODO: this does not necessarily mean we're actually viewing the playqueue :(
-            ScreenName::Home => SelectionContext::Queue,
-            _ => SelectionContext::Global,
-        }
-    }
-
     pub fn update_state(&mut self, message: AppAction) -> Vec<AppEvent> {
         match message {
             AppAction::Start => vec![AppEvent::Started],
@@ -136,13 +133,15 @@ impl AppState {
                     })
                     .unwrap_or_else(Vec::new)
             }
-            AppAction::ChangeSelectionMode(active) => {
-                let context = if active {
-                    Some(self.recommended_context())
+            AppAction::EnableSelection(context) => {
+                if let Some(active) = self.selection.set_mode(Some(context)) {
+                    vec![SelectionEvent::SelectionModeChanged(active).into()]
                 } else {
-                    None
-                };
-                if let Some(active) = self.selection.set_mode(context) {
+                    vec![]
+                }
+            }
+            AppAction::CancelSelection => {
+                if let Some(active) = self.selection.set_mode(None) {
                     vec![SelectionEvent::SelectionModeChanged(active).into()]
                 } else {
                     vec![]
diff --git a/src/app/state/browser_state.rs b/src/app/state/browser_state.rs
index 41959c5e..86d10916 100644
--- a/src/app/state/browser_state.rs
+++ b/src/app/state/browser_state.rs
@@ -8,6 +8,7 @@ use std::iter::Iterator;
 
 #[derive(Clone, Debug)]
 pub enum BrowserAction {
+    SetNavigationHidden(bool),
     SetLibraryContent(Vec<AlbumDescription>),
     AppendLibraryContent(Vec<AlbumDescription>),
     SetPlaylistsContent(Vec<PlaylistDescription>),
@@ -51,6 +52,7 @@ impl BrowserAction {
 
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum BrowserEvent {
+    NavigationHidden(bool),
     LibraryUpdated,
     SavedPlaylistsUpdated,
     AlbumDetailsLoaded(String),
@@ -206,6 +208,7 @@ where
 }
 
 pub struct BrowserState {
+    navigation_hidden: bool,
     navigation: NavStack<BrowserScreen>,
 }
 
@@ -230,6 +233,7 @@ macro_rules! extract_state_full {
 impl BrowserState {
     pub fn new() -> Self {
         Self {
+            navigation_hidden: false,
             navigation: NavStack::new(BrowserScreen::Home(Default::default())),
         }
     }
@@ -243,7 +247,7 @@ impl BrowserState {
     }
 
     pub fn can_pop(&self) -> bool {
-        self.navigation.can_pop()
+        self.navigation.can_pop() || self.navigation_hidden
     }
 
     pub fn count(&self) -> usize {
@@ -300,6 +304,10 @@ impl UpdatableState for BrowserState {
         let can_pop = self.navigation.can_pop();
 
         match action {
+            BrowserAction::SetNavigationHidden(navigation_hidden) => {
+                self.navigation_hidden = navigation_hidden;
+                vec![BrowserEvent::NavigationHidden(navigation_hidden)]
+            }
             BrowserAction::Search(_) => {
                 let mut events = self.push_if_needed(ScreenName::Search);
 
@@ -316,6 +324,10 @@ impl UpdatableState for BrowserState {
                 self.navigation.pop();
                 vec![BrowserEvent::NavigationPopped]
             }
+            BrowserAction::NavigationPop if self.navigation_hidden => {
+                self.navigation_hidden = false;
+                vec![BrowserEvent::NavigationHidden(false)]
+            }
             _ => {
                 let mut events: Vec<Self::Event> = vec![];
                 events.extend(
diff --git a/src/app/state/login_state.rs b/src/app/state/login_state.rs
index 1b910ba3..b2519288 100644
--- a/src/app/state/login_state.rs
+++ b/src/app/state/login_state.rs
@@ -69,20 +69,12 @@ impl From<LoginEvent> for AppEvent {
     }
 }
 
+#[derive(Default)]
 pub struct LoginState {
     pub user: Option<String>,
     pub playlists: Vec<PlaylistSummary>,
 }
 
-impl Default for LoginState {
-    fn default() -> Self {
-        Self {
-            user: None,
-            playlists: vec![],
-        }
-    }
-}
-
 impl UpdatableState for LoginState {
     type Action = LoginAction;
     type Event = AppEvent;
diff --git a/src/app/state/playback_state.rs b/src/app/state/playback_state.rs
index ff54035d..c37fff99 100644
--- a/src/app/state/playback_state.rs
+++ b/src/app/state/playback_state.rs
@@ -9,7 +9,6 @@ pub struct PlaybackState {
     index: LazyRandomIndex,
     songs: SongList,
     position: Option<usize>,
-    next_position: Option<usize>,
     source: Option<SongsSource>,
     repeat: RepeatMode,
     is_playing: bool,
@@ -218,7 +217,6 @@ impl Default for PlaybackState {
             index: LazyRandomIndex::default(),
             songs: SongList::new_sized(2 * RANGE_SIZE),
             position: None,
-            next_position: None,
             source: None,
             repeat: RepeatMode::None,
             is_playing: false,
@@ -241,6 +239,7 @@ pub enum PlaybackAction {
     Load(String),
     LoadSongs(Vec<SongDescription>),
     LoadPagedSongs(SongsSource, SongBatch),
+    SetVolume(f64),
     Next,
     Previous,
     Queue(Vec<SongDescription>),
@@ -269,6 +268,7 @@ pub enum PlaybackEvent {
     RepeatModeChanged(RepeatMode),
     TrackSeeked(u32),
     SeekSynced(u32),
+    VolumeSet(f64),
     TrackChanged(String),
     ShuffleChanged,
     PlaylistChanged(PlaylistChange),
@@ -415,6 +415,7 @@ impl UpdatableState for PlaybackState {
             }
             PlaybackAction::Seek(pos) => vec![PlaybackEvent::TrackSeeked(pos)],
             PlaybackAction::SyncSeek(pos) => vec![PlaybackEvent::SeekSynced(pos)],
+            PlaybackAction::SetVolume(volume) => vec![PlaybackEvent::VolumeSet(volume)],
             _ => vec![],
         }
     }
@@ -438,7 +439,7 @@ mod tests {
             },
             duration: 1000,
             art: None,
-            track_number: 0,
+            track_number: None,
         }
     }
 
diff --git a/src/app/state/screen_states.rs b/src/app/state/screen_states.rs
index 4e81e330..63f83c38 100644
--- a/src/app/state/screen_states.rs
+++ b/src/app/state/screen_states.rs
@@ -426,6 +426,7 @@ mod tests {
             id: "".to_owned(),
             title: "".to_owned(),
             artists: vec![],
+            release_date: Some("1970-01-01".to_owned()),
             art: Some("".to_owned()),
             songs: SongList::new_sized(100),
             is_liked: false,
diff --git a/src/app/state/selection_state.rs b/src/app/state/selection_state.rs
index 7404a11a..41619d44 100644
--- a/src/app/state/selection_state.rs
+++ b/src/app/state/selection_state.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::HashSet;
 
 use crate::app::models::SongDescription;
 use crate::app::state::{AppAction, AppEvent, UpdatableState};
@@ -28,15 +28,17 @@ impl From<SelectionEvent> for AppEvent {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 pub enum SelectionContext {
     Queue,
     Playlist,
-    Global,
+    EditablePlaylist(String),
+    Default,
 }
 
 pub struct SelectionState {
-    selected_songs: HashMap<String, SongDescription>,
+    selected_songs: Vec<SongDescription>,
+    selected_songs_ids: HashSet<String>,
     selection_active: bool,
     pub context: SelectionContext,
 }
@@ -45,36 +47,43 @@ impl Default for SelectionState {
     fn default() -> Self {
         Self {
             selected_songs: Default::default(),
+            selected_songs_ids: Default::default(),
             selection_active: false,
-            context: SelectionContext::Global,
+            context: SelectionContext::Default,
         }
     }
 }
 
 impl SelectionState {
     fn select(&mut self, song: SongDescription) -> bool {
-        let selected = self.selected_songs.contains_key(&song.id);
+        let selected = self.selected_songs_ids.contains(&song.id);
         if !selected {
-            self.selected_songs.insert(song.id.clone(), song);
+            self.selected_songs_ids.insert(song.id.clone());
+            self.selected_songs.push(song);
         }
         !selected
     }
 
     fn deselect(&mut self, id: &str) -> bool {
-        self.selected_songs.remove(id).is_some()
+        let songs: Vec<SongDescription> = std::mem::take(&mut self.selected_songs)
+            .into_iter()
+            .filter(|s| s.id != id)
+            .collect();
+        self.selected_songs = songs;
+        self.selected_songs_ids.remove(id)
     }
 
     pub fn set_mode(&mut self, context: Option<SelectionContext>) -> Option<bool> {
         let currently_active = self.selection_active;
         match (currently_active, context) {
             (false, Some(context)) => {
-                self.selected_songs = Default::default();
+                *self = Default::default();
                 self.selection_active = true;
                 self.context = context;
                 Some(true)
             }
             (true, None) => {
-                self.selected_songs = Default::default();
+                *self = Default::default();
                 self.selection_active = false;
                 Some(false)
             }
@@ -87,23 +96,19 @@ impl SelectionState {
     }
 
     pub fn is_song_selected(&self, id: &str) -> bool {
-        self.selected_songs.contains_key(id)
-    }
-
-    pub fn all_selected<'a>(&self, mut ids: impl Iterator<Item = &'a String>) -> bool {
-        ids.all(|id| self.is_song_selected(id))
+        self.selected_songs_ids.contains(id)
     }
 
     pub fn count(&self) -> usize {
-        self.selected_songs.len()
+        self.selected_songs_ids.len()
     }
 
     pub fn take_selection(&mut self) -> Vec<SongDescription> {
-        std::mem::take(self).selected_songs.into_values().collect()
+        std::mem::take(self).selected_songs
     }
 
     pub fn peek_selection(&self) -> impl Iterator<Item = &'_ SongDescription> {
-        self.selected_songs.values()
+        self.selected_songs.iter()
     }
 }
 
diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs
index 414fa68d..b0fc8482 100644
--- a/src/dbus/mod.rs
+++ b/src/dbus/mod.rs
@@ -158,6 +158,13 @@ impl EventListener for AppPlaybackStateListener {
                 })
                 .unwrap();
             }
+            AppEvent::PlaybackEvent(PlaybackEvent::VolumeSet(vol)) => {
+                self.with_player(|player| {
+                    player.state.set_volume(*vol);
+                    Ok(())
+                })
+                .unwrap();
+            }
             _ => {}
         }
     }
diff --git a/src/dbus/mpris.rs b/src/dbus/mpris.rs
index 18bf7c94..c666e553 100644
--- a/src/dbus/mpris.rs
+++ b/src/dbus/mpris.rs
@@ -314,9 +314,16 @@ impl SpotMprisPlayer {
 
     #[dbus_interface(property)]
     pub fn volume(&self) -> f64 {
-        0f64
+        self.state.volume()
     }
 
     #[dbus_interface(property)]
-    pub fn set_volume(&self, value: f64) {}
+    pub fn set_volume(&self, value: f64) -> Result<()> {
+        // As per spec, if new volume less than 0 round to 0
+        // also, we don't support volume higher than 100% at the moment.
+        let volume = value.clamp(0.0, 1.0);
+        self.sender
+            .unbounded_send(PlaybackAction::SetVolume(value).into())
+            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+    }
 }
diff --git a/src/dbus/types.rs b/src/dbus/types.rs
index d49d734a..6895427f 100644
--- a/src/dbus/types.rs
+++ b/src/dbus/types.rs
@@ -147,6 +147,7 @@ impl From<TrackMetadata> for Value<'_> {
 struct MprisState {
     status: PlaybackStatus,
     loop_status: LoopStatus,
+    volume: f64,
     shuffled: bool,
     position: PositionMicros,
     metadata: Option<TrackMetadata>,
@@ -167,9 +168,24 @@ impl SharedMprisState {
             metadata: None,
             has_prev: false,
             has_next: false,
+            volume: 1f64,
         })))
     }
 
+    pub fn volume(&self) -> f64 {
+        self.0
+            .lock()
+            .map(|s| s.volume)
+            .map_err(|e| error!("Failed to get volume: {:?}", e))
+            .unwrap_or(1.0f64)
+    }
+
+    pub fn set_volume(&self, volume: f64) {
+        if let Ok(mut state) = self.0.lock() {
+            (*state).volume = volume;
+        }
+    }
+
     pub fn status(&self) -> PlaybackStatus {
         self.0
             .lock()
diff --git a/src/main.rs b/src/main.rs
index 59916125..7dd0a5fb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ use gettextrs::*;
 use gio::prelude::*;
 use gio::SimpleAction;
 use gtk::prelude::*;
+use libadwaita::ColorScheme;
 
 mod api;
 mod app;
@@ -36,8 +37,10 @@ fn main() {
     expose_widgets();
     let builder = gtk::Builder::from_resource("/dev/alextren/Spot/window.ui");
     let window: libadwaita::ApplicationWindow = builder.object("window").unwrap();
+
     if cfg!(debug_assertions) {
         window.style_context().add_class("devel");
+        gtk_app.set_resource_base_path(Some("/dev/alextren/Spot"));
     }
 
     let context = glib::MainContext::default();
@@ -75,14 +78,17 @@ fn main() {
 fn startup(settings: &settings::SpotSettings) {
     gtk::init().unwrap_or_else(|_| panic!("Failed to initialize GTK"));
     libadwaita::init();
+    let manager = libadwaita::StyleManager::default().unwrap();
 
     let res = gio::Resource::load(config::PKGDATADIR.to_owned() + "/spot.gresource")
         .expect("Could not load resources");
     gio::resources_register(&res);
 
-    gtk::Settings::default()
-        .unwrap()
-        .set_gtk_application_prefer_dark_theme(settings.prefers_dark_theme);
+    manager.set_color_scheme(if settings.prefers_dark_theme {
+        ColorScheme::PreferDark
+    } else {
+        ColorScheme::PreferLight
+    });
 
     let provider = gtk::CssProvider::new();
     provider.load_from_resource("/dev/alextren/Spot/app.css");
diff --git a/src/meson.build b/src/meson.build
index 0191ab9a..e4899d3f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -63,105 +63,109 @@ run_command(
 
 # find . -name "*.rs" -printf "'%p',\n"
 sources = files(
-'./settings.rs',
-'./api/cache.rs',
-'./api/api_models.rs',
-'./api/client.rs',
 './api/cached_client.rs',
 './api/mod.rs',
-'./app/dispatch.rs',
-'./app/components/details/release_details.rs',
-'./app/components/details/details.rs',
-'./app/components/details/details_model.rs',
-'./app/components/details/mod.rs',
+'./api/client.rs',
+'./api/api_models.rs',
+'./api/cache.rs',
+'./dbus/types.rs',
+'./dbus/mpris.rs',
+'./dbus/mod.rs',
+'./config.rs',
+'./app/rng.rs',
+'./app/state/pagination.rs',
+'./app/state/app_state.rs',
+'./app/state/login_state.rs',
+'./app/state/browser_state.rs',
+'./app/state/playback_state.rs',
+'./app/state/mod.rs',
+'./app/state/screen_states.rs',
+'./app/state/selection_state.rs',
+'./app/state/app_model.rs',
+'./app/components/saved_playlists/saved_playlists.rs',
+'./app/components/saved_playlists/saved_playlists_model.rs',
+'./app/components/saved_playlists/mod.rs',
+'./app/components/notification/mod.rs',
+'./app/components/user_menu/mod.rs',
+'./app/components/user_menu/user_menu.rs',
+'./app/components/user_menu/user_menu_model.rs',
+'./app/components/artist_details/mod.rs',
+'./app/components/artist_details/artist_details_model.rs',
+'./app/components/artist_details/artist_details.rs',
+'./app/components/saved_tracks/saved_tracks.rs',
+'./app/components/saved_tracks/saved_tracks_model.rs',
+'./app/components/saved_tracks/mod.rs',
+'./app/components/search/search_model.rs',
+'./app/components/search/mod.rs',
+'./app/components/search/search.rs',
 './app/components/artist/mod.rs',
-'./app/components/utils.rs',
-'./app/components/playback/playback_widget.rs',
-'./app/components/playback/playback_info.rs',
-'./app/components/playback/component.rs',
-'./app/components/playback/playback_controls.rs',
-'./app/components/playback/mod.rs',
+'./app/components/player_notifier.rs',
+'./app/components/window/mod.rs',
+'./app/components/navigation/navigation.rs',
+'./app/components/navigation/home.rs',
+'./app/components/navigation/navigation_model.rs',
+'./app/components/navigation/mod.rs',
+'./app/components/navigation/factory.rs',
 './app/components/user_details/user_details_model.rs',
 './app/components/user_details/mod.rs',
 './app/components/user_details/user_details.rs',
-'./app/components/playlist_details/playlist_details.rs',
+'./app/components/selection/widget.rs',
+'./app/components/selection/component.rs',
+'./app/components/selection/mod.rs',
+'./app/components/sidebar_listbox/mod.rs',
+'./app/components/sidebar_listbox/sidebar_item.rs',
+'./app/components/sidebar_listbox/sidebar_row.rs',
+'./app/components/mod.rs',
+'./app/components/details/release_details.rs',
+'./app/components/details/album_header.rs',
+'./app/components/details/mod.rs',
+'./app/components/details/details.rs',
+'./app/components/details/details_model.rs',
+'./app/components/utils.rs',
+'./app/components/now_playing/now_playing_model.rs',
+'./app/components/now_playing/mod.rs',
+'./app/components/now_playing/now_playing.rs',
+'./app/components/login/login.rs',
+'./app/components/login/mod.rs',
+'./app/components/login/login_model.rs',
 './app/components/playlist_details/playlist_details_model.rs',
 './app/components/playlist_details/mod.rs',
+'./app/components/playlist_details/playlist_details.rs',
+'./app/components/headerbar/widget.rs',
+'./app/components/headerbar/component.rs',
+'./app/components/headerbar/mod.rs',
 './app/components/album/album.rs',
 './app/components/album/mod.rs',
-'./app/components/artist_details/artist_details.rs',
-'./app/components/artist_details/artist_details_model.rs',
-'./app/components/artist_details/mod.rs',
-'./app/components/selection/selection_heading.rs',
-'./app/components/selection/selection_widgets.rs',
-'./app/components/selection/mod.rs',
-'./app/components/selection/selection_tools.rs',
 './app/components/labels.rs',
-'./app/components/login/login.rs',
-'./app/components/login/mod.rs',
-'./app/components/login/login_model.rs',
-'./app/components/window/mod.rs',
-'./app/components/saved_playlists/saved_playlists_model.rs',
-'./app/components/saved_playlists/mod.rs',
-'./app/components/saved_playlists/saved_playlists.rs',
-'./app/components/library/library_model.rs',
-'./app/components/library/library.rs',
-'./app/components/library/mod.rs',
-'./app/components/player_notifier.rs',
-'./app/components/now_playing/now_playing.rs',
-'./app/components/now_playing/mod.rs',
-'./app/components/now_playing/now_playing_model.rs',
-'./app/components/user_menu/user_menu_model.rs',
-'./app/components/user_menu/mod.rs',
-'./app/components/user_menu/user_menu.rs',
 './app/components/playlist/song_actions.rs',
-'./app/components/playlist/song.rs',
 './app/components/playlist/playlist.rs',
 './app/components/playlist/mod.rs',
-'./app/components/navigation/navigation.rs',
-'./app/components/navigation/factory.rs',
-'./app/components/navigation/home.rs',
-'./app/components/navigation/mod.rs',
-'./app/components/navigation/navigation_model.rs',
-'./app/components/notification/mod.rs',
-'./app/components/saved_tracks/saved_tracks.rs',
-'./app/components/saved_tracks/saved_tracks_model.rs',
-'./app/components/saved_tracks/mod.rs',
-'./app/components/search/search_bar_model.rs',
-'./app/components/search/search_model.rs',
-'./app/components/search/search_bar.rs',
-'./app/components/search/mod.rs',
-'./app/components/search/search.rs',
-'./app/components/mod.rs',
+'./app/components/playlist/song.rs',
+'./app/components/playback/playback_controls.rs',
+'./app/components/playback/playback_widget.rs',
+'./app/components/playback/component.rs',
+'./app/components/playback/mod.rs',
+'./app/components/playback/playback_info.rs',
+'./app/components/library/library.rs',
+'./app/components/library/mod.rs',
+'./app/components/library/library_model.rs',
 './app/loader.rs',
-'./app/list_store.rs',
-'./app/rng.rs',
-'./app/credentials.rs',
 './app/models/core.rs',
-'./app/models/gtypes/album_model.rs',
-'./app/models/gtypes/song_model.rs',
 './app/models/gtypes/artist_model.rs',
+'./app/models/gtypes/song_model.rs',
+'./app/models/gtypes/album_model.rs',
 './app/models/gtypes/mod.rs',
-'./app/models/mod.rs',
 './app/models/main.rs',
-'./app/state/app_model.rs',
-'./app/state/pagination.rs',
-'./app/state/selection_state.rs',
-'./app/state/browser_state.rs',
-'./app/state/login_state.rs',
-'./app/state/screen_states.rs',
-'./app/state/playback_state.rs',
-'./app/state/app_state.rs',
-'./app/state/mod.rs',
+'./app/models/mod.rs',
+'./app/dispatch.rs',
+'./app/list_store.rs',
 './app/mod.rs',
+'./app/credentials.rs',
 './app/batch_loader.rs',
-'./config.rs',
-'./dbus/mpris.rs',
-'./dbus/mod.rs',
-'./dbus/types.rs',
+'./main.rs',
+'./settings.rs',
 './player/player.rs',
 './player/mod.rs',
-'./main.rs',
 )
 
 cargo_script = find_program(meson.source_root() / 'build-aux/cargo.sh')
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 2f8d126a..f91cb6c4 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -22,6 +22,7 @@ pub enum Command {
     PlayerPause,
     PlayerStop,
     PlayerSeek(u32),
+    PlayerSetVolume(f64),
     RefreshToken,
 }
 
diff --git a/src/player/player.rs b/src/player/player.rs
index 9b9fcca4..1093b7f6 100644
--- a/src/player/player.rs
+++ b/src/player/player.rs
@@ -6,10 +6,12 @@ use librespot::core::config::SessionConfig;
 use librespot::core::keymaster;
 use librespot::core::session::{Session, SessionError};
 
+use librespot::playback::mixer::softmixer::SoftMixer;
+use librespot::playback::mixer::{Mixer, MixerConfig};
 use librespot::protocol::authentication::AuthenticationType;
 
 use librespot::playback::audio_backend;
-use librespot::playback::config::{AudioFormat, Bitrate, PlayerConfig};
+use librespot::playback::config::{AudioFormat, Bitrate, PlayerConfig, VolumeCtrl};
 use librespot::playback::player::{Player, PlayerEvent, PlayerEventChannel};
 
 use std::cell::RefCell;
@@ -75,6 +77,7 @@ impl Default for SpotifyPlayerSettings {
 pub struct SpotifyPlayer {
     settings: SpotifyPlayerSettings,
     player: RefCell<Option<Player>>,
+    mixer: RefCell<Option<Box<dyn Mixer>>>,
     session: RefCell<Option<Session>>,
     delegate: Rc<dyn SpotifyPlayerDelegate>,
 }
@@ -83,6 +86,7 @@ impl SpotifyPlayer {
     pub fn new(settings: SpotifyPlayerSettings, delegate: Rc<dyn SpotifyPlayerDelegate>) -> Self {
         Self {
             settings,
+            mixer: RefCell::new(None),
             player: RefCell::new(None),
             session: RefCell::new(None),
             delegate,
@@ -93,6 +97,12 @@ impl SpotifyPlayer {
         let mut player = self.player.borrow_mut();
         let mut session = self.session.borrow_mut();
         match action {
+            Command::PlayerSetVolume(volume) => {
+                if let Some(mixer) = self.mixer.borrow_mut().as_mut() {
+                    mixer.set_volume((VolumeCtrl::MAX_VOLUME as f64 * volume) as u16);
+                }
+                Ok(())
+            }
             Command::PlayerResume => {
                 let player = player.as_ref().ok_or(SpotifyError::PlayerNotReady)?;
                 player.play();
@@ -182,7 +192,22 @@ impl SpotifyPlayer {
         };
         info!("bitrate: {:?}", &player_config.bitrate);
 
-        Player::new(player_config, session, None, move || match backend {
+        let filter = self
+            .mixer
+            .borrow_mut()
+            .get_or_insert_with(|| {
+                let mix = Box::new(SoftMixer::open(MixerConfig {
+                    // This value feels reasonable to me. Feel free to change it
+                    volume_ctrl: VolumeCtrl::Log(VolumeCtrl::DEFAULT_DB_RANGE / 2.0),
+                    ..Default::default()
+                }));
+                // TODO: Should read volume from somewhere instead of hard coding.
+                // Sets volume to 100%
+                mix.set_volume(VolumeCtrl::MAX_VOLUME);
+                mix
+            })
+            .get_audio_filter();
+        Player::new(player_config, session, filter, move || match backend {
             AudioBackend::PulseAudio => {
                 info!("using pulseaudio");
                 let backend = audio_backend::find(Some("pulseaudio".to_string())).unwrap();
diff --git a/src/settings.rs b/src/settings.rs
index c99bb497..ea3005c0 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -4,7 +4,7 @@ use librespot::playback::config::Bitrate;
 
 const SETTINGS: &str = "dev.alextren.Spot";
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct WindowGeometry {
     pub width: i32,
     pub height: i32,
@@ -34,16 +34,6 @@ impl WindowGeometry {
     }
 }
 
-impl Default for WindowGeometry {
-    fn default() -> Self {
-        Self {
-            width: 0,
-            height: 0,
-            is_maximized: false,
-        }
-    }
-}
-
 impl SpotifyPlayerSettings {
     pub fn new_from_gsettings() -> Option<Self> {
         let settings = gio::Settings::new(SETTINGS);
diff --git a/src/spot.gresource.xml b/src/spot.gresource.xml
index b8e341f7..a99d3655 100644
--- a/src/spot.gresource.xml
+++ b/src/spot.gresource.xml
@@ -13,11 +13,11 @@
     <!-- artist -->
     <file alias="components/artist.ui">app/components/artist/artist.ui</file>
     <!-- details -->
-    <file alias="components/details.css">app/components/details/details.css</file>
     <file alias="components/details.ui">app/components/details/details.ui</file>
+    <file alias="components/album_header.ui">app/components/details/album_header.ui</file>
+    <file alias="components/album_header.css">app/components/details/album_header.css</file>
     <file alias="components/release_details.ui">app/components/details/release_details.ui</file>
     <!-- playlist details -->
-    <file alias="components/playlist_details.css">app/components/playlist_details/playlist_details.css</file>
     <file alias="components/playlist_details.ui">app/components/playlist_details/playlist_details.ui</file>
     <!-- artist details -->
     <file alias="components/artist_details.css">app/components/artist_details/artist_details.css</file>
@@ -28,10 +28,8 @@
     <file alias="components/saved_playlists.ui">app/components/saved_playlists/saved_playlists.ui</file>
     <!-- now playing -->
     <file alias="components/now_playing.ui">app/components/now_playing/now_playing.ui</file>
-    <file alias="components/now_playing.css">app/components/now_playing/now_playing.css</file>
     <!-- liked songs -->
     <file alias="components/saved_tracks.ui">app/components/saved_tracks/saved_tracks.ui</file>
-    <file alias="components/saved_tracks.css">app/components/saved_tracks/saved_tracks.css</file>
     <!-- song -->
     <file alias="components/song.css">app/components/playlist/song.css</file>
     <file alias="components/song.ui">app/components/playlist/song.ui</file>
@@ -43,5 +41,18 @@
     <file alias="components/playback_controls.ui">app/components/playback/playback_controls.ui</file>
     <file alias="components/playback_info.ui">app/components/playback/playback_info.ui</file>
     <file alias="components/playback_widget.ui">app/components/playback/playback_widget.ui</file>
+    <!-- selection -->
+    <file alias="components/selection_toolbar.ui">app/components/selection/selection_toolbar.ui</file>
+    <file alias="components/selection_toolbar.css">app/components/selection/selection_toolbar.css</file>
+    <!-- headerbar -->
+    <file alias="components/headerbar.ui">app/components/headerbar/headerbar.ui</file>
+    <!-- sidebar_listbox -->
+    <file alias="sidebar_listbox/sidebar.css">app/components/sidebar_listbox/sidebar.css</file>
+    <file alias="sidebar_listbox/sidebar_icon_widget.ui">app/components/sidebar_listbox/sidebar_icon_widget.ui</file>
   </gresource>
-</gresources>
+  <gresource prefix="/dev/alextren/Spot/icons/scalable/actions/">
+    <file compressed="true" preprocess="xml-stripblanks" alias="music-queue-symbolic.svg">app/components/selection/icons/music-queue-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="playlist2-symbolic.svg">app/components/selection/icons/playlist2-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="library-music-symbolic.svg">app/components/sidebar_listbox/icons/library-music-symbolic.svg</file>
+  </gresource>
+</gresources>
\ No newline at end of file
diff --git a/src/window.ui.in b/src/window.ui.in
index c69d111e..423e8e66 100644
--- a/src/window.ui.in
+++ b/src/window.ui.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
   <object class="AdwApplicationWindow" id="window">
     <property name="default-width">1080</property>
     <property name="default-height">720</property>
@@ -44,64 +44,59 @@
           </object>
         </child>
         <child>
-          <object class="AdwHeaderBar" id="header_bar">
-            <child type="title">
-              <object class="GtkLabel" id="selection_label">
-                <property name="visible">0</property>
-                <property name="label" translatable="yes" comments="This text appears when entering selection mode. It should be as short as possible.">No song selected</property>
-                <property name="ellipsize">end</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="nav_back">
-                <property name="receives-default">1</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="icon-name">go-previous-symbolic</property>
-                <property name="has-frame">0</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="search_button">
-                <property name="receives-default">1</property>
-                <property name="icon-name">system-search-symbolic</property>
-              </object>
-            </child>
-            <child type="end">
-              <object class="GtkMenuButton" id="user">
-                <property name="receives-default">1</property>
-                <property name="icon-name">open-menu-symbolic</property>
-              </object>
-            </child>
-            <child type="end">
-              <object class="GtkToggleButton" id="selection_toggle">
-                <property name="receives-default">1</property>
-                <property name="icon-name">object-select-symbolic</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSearchBar" id="search_bar">
-            <property name="show-close-button">1</property>
+          <object class="AdwLeaflet" id="leaflet">
+            <property name="vexpand">1</property>
             <child>
-              <object class="GtkSearchEntry" id="search_entry">
-                <property name="hexpand">1</property>
+              <object class="AdwLeafletPage">
+                <property name="navigatable">0</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="AdwHeaderBar">
+                        <binding name="show-end-title-buttons">
+                          <lookup name="folded">leaflet</lookup>
+                        </binding>
+                        <child>
+                          <object class="GtkButton" id="search_button">
+                            <property name="receives-default">1</property>
+                            <property name="icon-name">system-search-symbolic</property>
+                          </object>
+                        </child>
+                        <child type="title">
+                          <object class="AdwWindowTitle">
+                            <property name="title" translatable="no">Spot</property>
+                          </object>
+                        </child>
+                        <child type="end">
+                          <object class="GtkMenuButton" id="user">
+                            <property name="receives-default">1</property>
+                            <property name="icon-name">open-menu-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow">
+                        <property name="hscrollbar-policy">never</property>
+                        <property name="child">
+                          <object class="GtkListBox" id="home_listbox">
+                            <property name="width-request">200</property>
+                            <property name="vexpand">1</property>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwLeaflet" id="leaflet">
-            <property name="vexpand">1</property>
-            <property name="visible-child">main</property>
             <child>
               <object class="AdwLeafletPage">
                 <property name="navigatable">0</property>
                 <property name="child">
-                  <object class="GtkStackSidebar" id="home_stack_sidebar">
-                    <property name="width-request">200</property>
-                    <property name="vexpand">1</property>
+                  <object class="GtkSeparator">
+                    <property name="orientation">vertical</property>
                   </object>
                 </property>
               </object>
@@ -110,46 +105,63 @@
               <object class="AdwLeafletPage">
                 <property name="name">main</property>
                 <property name="child">
-                  <object class="GtkOverlay" id="main">
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkStack" id="navigation_stack">
-                        <property name="transition-type">slide-left-right</property>
+                      <object class="GtkOverlay" id="main">
+                        <property name="hexpand">1</property>
+                        <property name="vexpand">1</property>
+                        <child>
+                          <object class="GtkStack" id="navigation_stack">
+                            <property name="transition-type">slide-left-right</property>
+                          </object>
+                        </child>
+                        <child type="overlay">
+                          <object class="GtkBox" id="notification">
+                            <property name="halign">center</property>
+                            <property name="valign">start</property>
+                            <property name="margin-top">50</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkLabel" id="notification_content">
+                                <property name="label">Information</property>
+                                <property name="wrap">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="close_notification">
+                                <property name="receives-default">1</property>
+                                <property name="icon-name">window-close-symbolic</property>
+                              </object>
+                            </child>
+                            <style>
+                              <class name="app-notification" />
+                              <class name="notification" />
+                            </style>
+                          </object>
+                        </child>
                       </object>
                     </child>
-                    <child type="overlay">
-                      <object class="GtkBox" id="notification">
-                        <property name="halign">center</property>
-                        <property name="valign">start</property>
-                        <property name="spacing">10</property>
+                    <child>
+                      <object class="GtkOverlay">
+                        <property name="hexpand">1</property>
                         <child>
-                          <object class="GtkLabel" id="notification_content">
-                            <property name="label">Information</property>
-                            <property name="wrap">1</property>
+                          <object class="PlaybackWidget" id="playback">
+                            <property name="hexpand">1</property>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkButton" id="close_notification">
-                            <property name="receives-default">1</property>
-                            <property name="icon-name">window-close-symbolic</property>
+                        <child type="overlay">
+                          <object class="SelectionToolbarWidget" id="selection_toolbar">
+                            <property name="hexpand">1</property>
                           </object>
                         </child>
-                        <style>
-                          <class name="app-notification"/>
-                          <class name="notification"/>
-                        </style>
                       </object>
                     </child>
                   </object>
                 </property>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="PlaybackWidget" id="playback">
-            <property name="hexpand">1</property>
+            <property name="visible-child">main</property>
           </object>
         </child>
       </object>
@@ -167,4 +179,4 @@
     <property name="logo-icon-name">dev.alextren.Spot</property>
     <property name="license-type">mit-x11</property>
   </object>
-</interface>
+</interface>
\ No newline at end of file