diff --git a/data/gresource.xml b/data/gresource.xml
index 36247ad90..e37b2b79b 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -7,7 +7,6 @@
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-hashtag-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-bookmarks-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-bookmarks-filled-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-starred-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-unstarred-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-online-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-smile-symbolic.svg</file>
@@ -21,18 +20,15 @@
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-mail-small-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-mail-open-small-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-loupe-large-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-view-more-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-mark-important-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-reply-sender-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-reply-all-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-media-playlist-repeat-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-sentiment-dissatisfied-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-network-server-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-key-password-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-key-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-check-round-outline-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-gear-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-settings-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-clipboard-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-trash-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-plus-large-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-paper-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-paper-small-symbolic.svg</file>
@@ -41,21 +37,13 @@
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-right-large-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-bell-outline-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-list-compact-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-clip-attachment-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-people-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-home-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-chat-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-contact-new-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-dock-left-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-about-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-error-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-minus-large-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-cross-large-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-address-book-new-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-eye-open-negative-filled-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-eye-not-looking-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-view-fullscreen-symbolic.svg</file>
-        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-view-restore-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-music-note-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-newspaper-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-explore2-large-symbolic.svg</file>
diff --git a/data/icons/scalable/actions/tuba-about-symbolic.svg b/data/icons/scalable/actions/tuba-about-symbolic.svg
deleted file mode 100644
index 3f5c3dc6a..000000000
--- a/data/icons/scalable/actions/tuba-about-symbolic.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 8 0 c -4.421875 0 -8 3.578125 -8 8 s 3.578125 8 8 8 s 8 -3.578125 8 -8 s -3.578125 -8 -8 -8 z m 0 3.875 c 0.621094 0 1.125 0.503906 1.125 1.125 s -0.503906 1.125 -1.125 1.125 s -1.125 -0.503906 -1.125 -1.125 s 0.503906 -1.125 1.125 -1.125 z m -1.523438 3.125 h 2.523438 v 4 h 0.5 c 0.277344 0 0.5 0.222656 0.5 0.5 s -0.222656 0.5 -0.5 0.5 h -2.5 v -4 h -0.5 c -0.277344 0 -0.5 -0.222656 -0.5 -0.5 c 0 -0.269531 0.210938 -0.488281 0.476562 -0.5 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg b/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg
deleted file mode 100644
index 3904b83f3..000000000
--- a/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 5 0 c -1.292969 0 -2.40625 0.839844 -2.824219 2 h -1.175781 v 2 h 1 v 1 h -1 v 2 h 1 v 1 h -1 v 2 h 1 v 1 h -1 v 2 h 1.175781 c 0.417969 1.160156 1.53125 2 2.824219 2 h 1 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -1 c -0.554688 0 -1 -0.445312 -1 -1 v -9 c 0 -0.554688 0.445312 -1 1 -1 h 7 c 0.570312 0 0.886719 0.441406 1 1 v 3 c 0 0.550781 0.449219 1 1 1 s 1 -0.449219 1 -1 v -3 c 0 -1.644531 -1.355469 -3 -3 -3 z m 3.523438 4 c -0.078126 0 -0.15625 0.003906 -0.238282 0.011719 c -0.214844 0.011719 -0.429687 0.046875 -0.640625 0.101562 c -1.710937 0.433594 -2.839843 2.082031 -2.617187 3.832031 c 0.152344 1.214844 0.925781 2.222657 1.972656 2.722657 v -0.667969 h 1.332031 c -1.1875 -0.078125 -2.160156 -0.980469 -2.3125 -2.179688 c -0.160156 -1.257812 0.640625 -2.425781 1.867188 -2.738281 c 0.617187 -0.15625 1.28125 -0.078125 1.808593 0.164063 c 0.527344 0.242187 0.890626 0.628906 1.003907 1.058594 c 0.0625 0.230468 0.082031 0.472656 0.070312 0.695312 h 1.007813 c 0.011718 -0.320312 -0.03125 -0.644531 -0.109375 -0.953125 c -0.210938 -0.785156 -0.820313 -1.371094 -1.554688 -1.710937 c -0.484375 -0.21875 -1.027343 -0.339844 -1.589843 -0.335938 z m -0.023438 2.007812 c -0.824219 0 -1.5 0.675782 -1.5 1.5 c 0 0.820313 0.675781 1.5 1.5 1.5 c 0.175781 0 0.34375 -0.039062 0.5 -0.09375 v 0.042969 l 0.449219 0.046875 c 0.191406 0.019532 0.375 0.015625 0.550781 -0.003906 v -1.492188 c 0 -0.824218 -0.675781 -1.5 -1.5 -1.5 z m 0 1 c 0.28125 0 0.5 0.214844 0.5 0.5 c 0 0.28125 -0.21875 0.5 -0.5 0.5 s -0.5 -0.21875 -0.5 -0.5 c 0 -0.285156 0.21875 -0.5 0.5 -0.5 z m 2.5 0.992188 v 3 h -3 v 2 h 3 v 3 h 2 v -3 h 3 v -2 h -3 v -3 z m -1.15625 1.78125 s -0.605469 0.191406 -1.1875 0.21875 h 1.257812 z m 0 0" fill="#2e3434"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-clip-attachment-symbolic.svg b/data/icons/scalable/actions/tuba-clip-attachment-symbolic.svg
deleted file mode 100644
index 4c25cccb5..000000000
--- a/data/icons/scalable/actions/tuba-clip-attachment-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 9.75 0.277344 c -0.890625 0 -1.78125 0.339844 -2.457031 1.015625 l -3.5 3.5 c -0.019531 0.019531 -0.039063 0.039062 -0.058594 0.0625 c -0.070313 0.082031 -0.574219 0.628906 -0.792969 1.4375 c -0.21875 0.804687 -0.058594 1.972656 0.839844 2.902343 c 0.914062 0.941407 2.128906 1.09375 2.945312 0.867188 c 0.8125 -0.230469 1.222657 -0.585938 1.5 -0.875 l 1.980469 -1.980469 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 s -1.023437 -0.390625 -1.414062 0 l -2 2 c -0.007813 0.003906 -0.011719 0.011719 -0.019531 0.019531 c 0.113281 -0.117188 -0.289063 0.238281 -0.589844 0.324219 c -0.296875 0.082031 -0.5 0.148437 -0.964844 -0.332031 c -0.484375 -0.5 -0.421875 -0.710938 -0.347656 -0.988282 c 0.074218 -0.273437 0.257812 -0.503906 0.386718 -0.660156 l 3.449219 -3.449219 c 0.644531 -0.644531 1.441407 -0.644531 2.085938 0 l 2.5 2.5 c 0.644531 0.644531 0.644531 1.441407 0 2.085938 l -6 6 s -0.183594 0.183593 -0.472657 0.375 c -0.289062 0.191406 -0.652343 0.332031 -0.820312 0.332031 h -3 c -0.167969 0 -0.449219 -0.113281 -0.667969 -0.332031 s -0.332031 -0.5 -0.332031 -0.667969 v -4 c 0 -0.550781 -0.449219 -1 -1 -1 s -1 0.449219 -1 1 v 4 c 0 0.832031 0.386719 1.550781 0.917969 2.082031 s 1.25 0.917969 2.082031 0.917969 h 3 c 0.832031 0 1.46875 -0.359375 1.929688 -0.667969 c 0.460937 -0.308593 0.777343 -0.625 0.777343 -0.625 l 6 -6 c 1.355469 -1.355469 1.355469 -3.558593 0 -4.914062 l -2.5 -2.5 c -0.675781 -0.675781 -1.566406 -1.015625 -2.457031 -1.015625 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-contact-new-symbolic.svg b/data/icons/scalable/actions/tuba-contact-new-symbolic.svg
deleted file mode 100644
index bff976f21..000000000
--- a/data/icons/scalable/actions/tuba-contact-new-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 8 1 c -1.65625 0 -3 1.34375 -3 3 s 1.34375 3 3 3 s 3 -1.34375 3 -3 s -1.34375 -3 -3 -3 z m -1.5 7 c -2.492188 0 -4.5 2.007812 -4.5 4.5 v 0.5 c 0 1.109375 0.890625 2 2 2 h 6 v -1 h -3 v -4 h 3 v -1.972656 c -0.164062 -0.019532 -0.332031 -0.027344 -0.5 -0.027344 z m 4.5 0 v 3 h -3 v 2 h 3 v 3 h 2 v -3 h 3 v -2 h -3 v -3 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-error-symbolic.svg b/data/icons/scalable/actions/tuba-error-symbolic.svg
deleted file mode 100644
index 10ac209f2..000000000
--- a/data/icons/scalable/actions/tuba-error-symbolic.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 8 0.0390625 c -4.410156 0 -7.9726562 3.5624995 -7.9726562 7.9726565 c 0 4.40625 3.5625002 7.972656 7.9726562 7.972656 c 4.40625 0 7.972656 -3.566406 7.972656 -7.972656 c 0 -4.410157 -3.566406 -7.9726565 -7.972656 -7.9726565 z m -5 6.9726565 h 10 v 2 h -10 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-gear-symbolic.svg b/data/icons/scalable/actions/tuba-gear-symbolic.svg
deleted file mode 100644
index ff0668a13..000000000
--- a/data/icons/scalable/actions/tuba-gear-symbolic.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 8 1 c -0.21875 0 -0.441406 0.011719 -0.65625 0.03125 l -0.40625 2.09375 c -0.332031 0.070312 -0.65625 0.175781 -0.96875 0.3125 l -1.53125 -1.464844 c -0.386719 0.226563 -0.726562 0.511719 -1.0625 0.808594 l 0.90625 1.90625 c -0.222656 0.25 -0.421875 0.523438 -0.59375 0.8125 l -2.09375 -0.277344 c -0.175781 0.410156 -0.3125 0.839844 -0.40625 1.277344 l 1.84375 1 c -0.019531 0.167969 -0.027344 0.332031 -0.03125 0.5 c 0 0.171875 0.015625 0.332031 0.03125 0.5 l -1.84375 1 c 0.097656 0.445312 0.226562 0.871094 0.40625 1.28125 l 2.09375 -0.28125 c 0.171875 0.289062 0.371094 0.5625 0.59375 0.8125 l -0.90625 1.90625 c 0.335938 0.300781 0.675781 0.582031 1.0625 0.8125 l 1.53125 -1.46875 c 0.304688 0.136719 0.632812 0.238281 0.96875 0.3125 l 0.40625 2.09375 c 0.4375 0.042969 0.875 0.042969 1.3125 0 l 0.40625 -2.09375 c 0.335938 -0.074219 0.664062 -0.175781 0.96875 -0.3125 l 1.53125 1.46875 c 0.386719 -0.230469 0.726562 -0.511719 1.0625 -0.8125 l -0.90625 -1.90625 c 0.222656 -0.25 0.421875 -0.523438 0.59375 -0.8125 l 2.09375 0.28125 c 0.175781 -0.414062 0.3125 -0.839844 0.40625 -1.28125 l -1.84375 -1 c 0.015625 -0.167969 0.03125 -0.328125 0.03125 -0.5 s -0.015625 -0.332031 -0.03125 -0.5 l 1.84375 -1 c -0.09375 -0.4375 -0.230469 -0.867188 -0.40625 -1.28125 l -2.09375 0.28125 c -0.171875 -0.289062 -0.367188 -0.5625 -0.59375 -0.8125 l 0.90625 -1.90625 c -0.335938 -0.296875 -0.675781 -0.582031 -1.0625 -0.8125 l -1.53125 1.46875 c -0.3125 -0.136719 -0.636719 -0.242188 -0.96875 -0.3125 l -0.40625 -2.09375 c -0.21875 -0.019531 -0.4375 -0.03125 -0.65625 -0.03125 z m 0 4 c 1.65625 0 3 1.34375 3 3 s -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-home-symbolic.svg b/data/icons/scalable/actions/tuba-home-symbolic.svg
deleted file mode 100644
index cb98cf63e..000000000
--- a/data/icons/scalable/actions/tuba-home-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 8 1 c -0.207031 0 -0.410156 0.066406 -0.582031 0.183594 l -7 5 c -0.449219 0.324218 -0.554688 0.945312 -0.234375 1.394531 c 0.191406 0.265625 0.492187 0.421875 0.816406 0.417969 v 4.003906 c 0 1.644531 1.355469 3 3 3 h 8 c 1.644531 0 3 -1.320312 3 -3 v -4.003906 c 0.324219 0.003906 0.625 -0.152344 0.816406 -0.417969 c 0.320313 -0.449219 0.214844 -1.070313 -0.234375 -1.394531 l -7 -5 c -0.171875 -0.117188 -0.375 -0.183594 -0.582031 -0.183594 z m 0 2.226562 l 5 3.570313 v 5.203125 c 0 0.5625 -0.4375 1 -1 1 h -3 v -4 c 0 -0.554688 -0.445312 -1 -1 -1 h -1 c -0.554688 0 -1 0.445312 -1 1 v 4 h -2 c -0.5625 0 -1 -0.4375 -1 -1 v -5.203125 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-key-password-symbolic.svg b/data/icons/scalable/actions/tuba-key-password-symbolic.svg
deleted file mode 100644
index 7a5e13619..000000000
--- a/data/icons/scalable/actions/tuba-key-password-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 6 1 c -2.761719 0 -5 2.238281 -5 5 s 2.238281 5 5 5 c 0.832031 -0.003906 1.652344 -0.214844 2.382812 -0.617188 l 0.617188 0.617188 v 2 h 2 v 2 h 4 v -3 l -4.308594 -4.308594 c 0.199219 -0.542968 0.304688 -1.113281 0.308594 -1.691406 c 0 -2.761719 -2.238281 -5 -5 -5 z m -1 3 c 0.550781 0 1 0.449219 1 1 s -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-key-symbolic.svg b/data/icons/scalable/actions/tuba-key-symbolic.svg
new file mode 100644
index 000000000..e42c475a2
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-key-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 6 5 c -2.761719 0 -5 2.238281 -5 5 s 2.238281 5 5 5 s 5 -2.238281 5 -5 s -2.238281 -5 -5 -5 z m -1 5 c 0.550781 0 1 0.449219 1 1 s -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 z m 0 0"/><path d="m 15 1 h -3 l -6 6 l 4 1 l 1 -1 h 2 v -2 h 2 z m 0 0"/></svg>
diff --git a/data/icons/scalable/actions/tuba-network-server-symbolic.svg b/data/icons/scalable/actions/tuba-network-server-symbolic.svg
deleted file mode 100644
index dbdb87248..000000000
--- a/data/icons/scalable/actions/tuba-network-server-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 6 0 c -1.644531 0 -3 1.355469 -3 3 v 6 c 0 1.644531 1.355469 3 3 3 h 1.03125 v 1.996094 h -5.5 c -0.277344 0 -0.5 0.222656 -0.5 0.5 v 1 c 0 0.273437 0.222656 0.5 0.5 0.5 h 13 c 0.277344 0 0.5 -0.226563 0.5 -0.5 v -1 c 0 -0.277344 -0.222656 -0.5 -0.5 -0.5 h -5.5 v -1.996094 h 0.96875 c 1.644531 0 3 -1.355469 3 -3 v -6 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 4 c 0.570312 0 1 0.429688 1 1 v 6 c 0 0.570312 -0.429688 1 -1 1 h -4 c -0.570312 0 -1 -0.429688 -1 -1 v -6 c 0 -0.570312 0.429688 -1 1 -1 z m 0 1 v 1 h 4 v -1 z m 3 2 v 1 h 1 v -1 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-settings-symbolic.svg b/data/icons/scalable/actions/tuba-settings-symbolic.svg
new file mode 100644
index 000000000..cc6a1374a
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-settings-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 7.5 1.019531 c -0.550781 0 -0.996094 0.445313 -0.996094 0.996094 v 0.453125 c -0.472656 0.128906 -0.929687 0.320312 -1.355468 0.566406 l -0.324219 -0.324218 c -0.390625 -0.390626 -1.019531 -0.390626 -1.410157 0 l -0.703124 0.707031 c -0.390626 0.390625 -0.390626 1.019531 0 1.410156 l 0.320312 0.320313 c -0.246094 0.425781 -0.433594 0.882812 -0.5625 1.355468 h -0.453125 c -0.550781 0 -0.996094 0.445313 -0.996094 0.996094 v 1 c 0 0.550781 0.445313 0.996094 0.996094 0.996094 h 0.449219 c 0.132812 0.472656 0.320312 0.929687 0.566406 1.355468 l -0.320312 0.320313 c -0.390626 0.390625 -0.390626 1.019531 0 1.410156 l 0.703124 0.707031 c 0.390626 0.390626 1.019532 0.390626 1.410157 0 l 0.320312 -0.320312 c 0.429688 0.242188 0.882813 0.433594 1.359375 0.558594 v 0.457031 c 0 0.550781 0.445313 0.996094 0.996094 0.996094 h 0.996094 c 0.554687 0 1 -0.445313 1 -0.996094 v -0.453125 c 0.472656 -0.128906 0.929687 -0.320312 1.355468 -0.566406 l 0.320313 0.324218 c 0.390625 0.390626 1.019531 0.390626 1.410156 0 l 0.707031 -0.707031 c 0.390626 -0.390625 0.390626 -1.019531 0 -1.410156 l -0.320312 -0.320313 c 0.242188 -0.425781 0.433594 -0.882812 0.558594 -1.355468 h 0.453125 c 0.554687 0 1 -0.445313 1 -0.996094 v -1 c 0 -0.550781 -0.445313 -0.996094 -1 -0.996094 h -0.449219 c -0.128906 -0.472656 -0.320312 -0.929687 -0.566406 -1.355468 l 0.324218 -0.320313 c 0.390626 -0.390625 0.390626 -1.019531 0 -1.410156 l -0.707031 -0.707031 c -0.390625 -0.390626 -1.019531 -0.390626 -1.410156 0 l -0.320313 0.320312 c -0.425781 -0.242188 -0.882812 -0.429688 -1.355468 -0.558594 v -0.457031 c 0 -0.550781 -0.445313 -0.996094 -1 -0.996094 z m 0.515625 3.976563 c 1.660156 0 3 1.34375 3 3 s -1.339844 3 -3 3 c -1.65625 0 -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 z m 0 0"/></svg>
diff --git a/data/icons/scalable/actions/tuba-starred-symbolic.svg b/data/icons/scalable/actions/tuba-starred-symbolic.svg
deleted file mode 100644
index 9249d421d..000000000
--- a/data/icons/scalable/actions/tuba-starred-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 8 0 c -0.429688 0 -0.8125 0.273438 -0.949219 0.683594 l -1.449219 4.339844 l -4.589843 -0.015626 c -0.980469 -0.003906 -1.382813 1.257813 -0.582031 1.820313 l 3.625 2.554687 l -1.5 4.285157 c -0.316407 0.902343 0.6875 1.691406 1.492187 1.171875 l 4.003906 -2.59375 l 3.894531 2.585937 c 0.800782 0.53125 1.816407 -0.257812 1.5 -1.160156 l -1.503906 -4.289063 l 3.644532 -2.578124 c 0.789062 -0.5625 0.394531 -1.808594 -0.574219 -1.8125 l -4.660157 -0.015626 l -1.402343 -4.285156 c -0.132813 -0.410156 -0.515625 -0.68749975 -0.949219 -0.691406 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-trash-symbolic.svg b/data/icons/scalable/actions/tuba-trash-symbolic.svg
deleted file mode 100644
index b6f8bd1db..000000000
--- a/data/icons/scalable/actions/tuba-trash-symbolic.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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 1 3 h 14 c 0.550781 0 1 0.449219 1 1 s -0.449219 1 -1 1 h -14 c -0.550781 0 -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 z m 0 0"/>
-        <path d="m 4 4 v -1.5 c 0 -1.386719 1.113281 -2.5 2.5 -2.5 h 2.980469 c 1.382812 0 2.5 1.113281 2.5 2.5 v 1.5 h -2 v -1.5 c 0 -0.269531 -0.230469 -0.5 -0.5 -0.5 h -2.980469 c -0.269531 0 -0.5 0.230469 -0.5 0.5 v 1.5 z m 0 0"/>
-        <path d="m 4 4 v 9 c 0 0.546875 0.453125 1 1 1 h 6 c 0.546875 0 1 -0.453125 1 -1 v -9 h 2 v 9 c 0 1.660156 -1.339844 3 -3 3 h -6 c -1.660156 0 -3 -1.339844 -3 -3 v -9 z m 0 0"/>
-        <path d="m 7 7 v 5 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -5 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 s 0.5 0.222656 0.5 0.5 z m 0 0"/>
-        <path d="m 10 7 v 5 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -5 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 s 0.5 0.222656 0.5 0.5 z m 0 0"/>
-    </g>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-view-fullscreen-symbolic.svg b/data/icons/scalable/actions/tuba-view-fullscreen-symbolic.svg
deleted file mode 100644
index e65d6d69c..000000000
--- a/data/icons/scalable/actions/tuba-view-fullscreen-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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 1 9 c -0.550781 0 -1 0.449219 -1 1 v 6 h 6 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -2.585938 l 3.292969 -3.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 l -3.292969 3.292969 v -2.585938 c 0 -0.550781 -0.449219 -1 -1 -1 z m 0 0"/>
-        <path d="m 15 7 c 0.550781 0 1 -0.449219 1 -1 v -6 h -6 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 2.585938 l -3.292969 3.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 c 0.1875 0.1875 0.441406 0.292969 0.707031 0.292969 s 0.519531 -0.105469 0.707031 -0.292969 l 3.292969 -3.292969 v 2.585938 c 0 0.550781 0.449219 1 1 1 z m 0 0"/>
-    </g>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-view-more-symbolic.svg b/data/icons/scalable/actions/tuba-view-more-symbolic.svg
deleted file mode 100644
index 9bb567fc7..000000000
--- a/data/icons/scalable/actions/tuba-view-more-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 7.996094 0 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 c 1.101562 0 2 -0.894531 2 -2 s -0.898438 -2 -2 -2 z m 0 6 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 c 1.101562 0 2 -0.894531 2 -2 s -0.898438 -2 -2 -2 z m 0 6 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 c 1.101562 0 2 -0.894531 2 -2 s -0.898438 -2 -2 -2 z m 0 0" fill="#2e3436"/>
-</svg>
diff --git a/data/icons/scalable/actions/tuba-view-restore-symbolic.svg b/data/icons/scalable/actions/tuba-view-restore-symbolic.svg
deleted file mode 100644
index 3bd41d863..000000000
--- a/data/icons/scalable/actions/tuba-view-restore-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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 2 8 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 2.585938 l -3.292969 3.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 3.292969 -3.292969 v 2.585938 c 0 0.550781 0.449219 1 1 1 s 1 -0.449219 1 -1 v -6 z m 0 0"/>
-        <path d="m 14 8 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -2.585938 l 3.292969 -3.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 s -1.023437 -0.390625 -1.414062 0 l -3.292969 3.292969 v -2.585938 c 0 -0.550781 -0.449219 -1 -1 -1 s -1 0.449219 -1 1 v 6 z m 0 0"/>
-    </g>
-</svg>
diff --git a/data/ui/dialogs/list_edit.ui b/data/ui/dialogs/list_edit.ui
index 8ca9ba232..87c835aa2 100644
--- a/data/ui/dialogs/list_edit.ui
+++ b/data/ui/dialogs/list_edit.ui
@@ -18,7 +18,7 @@
     <property name="default_height">400</property>
     <child>
       <object class="AdwPreferencesPage">
-        <property name="icon-name">tuba-gear-symbolic</property>
+        <property name="icon-name">tuba-settings-symbolic</property>
         <property name="title" translatable="yes">General</property>
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/data/ui/dialogs/new_account.ui b/data/ui/dialogs/new_account.ui
index 05e5eb007..71724a482 100644
--- a/data/ui/dialogs/new_account.ui
+++ b/data/ui/dialogs/new_account.ui
@@ -37,7 +37,7 @@
                 <property name="content">
                   <object class="AdwStatusPage">
                     <property name="vexpand">1</property>
-                    <property name="icon_name">tuba-network-server-symbolic</property>
+                    <property name="icon_name">network-server-symbolic</property>
                     <property name="title" translatable="yes">What is your Server?</property>
                     <!-- translators: Please replace the joinmastodon.org/servers link with the one for your language if available -->
                     <property name="description" translatable="yes">If you don&apos;t have an account yet, &lt;a href=&quot;https://joinmastodon.org/servers&quot;&gt;choose a server and register one&lt;/a&gt;.</property>
@@ -114,7 +114,7 @@
                 <property name="content">
                   <object class="AdwStatusPage" id="auth_page">
                     <property name="vexpand">1</property>
-                    <property name="icon_name">tuba-key-password-symbolic</property>
+                    <property name="icon_name">tuba-key-symbolic</property>
                     <property name="title" translatable="yes">Confirm Authorization</property>
                     <style>
                         <class name="compact"/>
diff --git a/data/ui/dialogs/preferences.ui b/data/ui/dialogs/preferences.ui
index 8a18b4300..ed68c776e 100644
--- a/data/ui/dialogs/preferences.ui
+++ b/data/ui/dialogs/preferences.ui
@@ -15,7 +15,7 @@
 	<template class="TubaDialogsPreferences" parent="AdwPreferencesWindow">
 		<child>
 			<object class="AdwPreferencesPage">
-				<property name="icon_name">tuba-gear-symbolic</property>
+				<property name="icon_name">tuba-settings-symbolic</property>
 				<property name="title" translatable="yes">General</property>
 				<child>
 					<object class="AdwPreferencesGroup">
diff --git a/data/ui/views/sidebar/account.ui b/data/ui/views/sidebar/account.ui
index dd4373472..b134a0890 100644
--- a/data/ui/views/sidebar/account.ui
+++ b/data/ui/views/sidebar/account.ui
@@ -31,7 +31,7 @@
 
 		<child type="suffix">
 			<object class="GtkButton" id="forget">
-				<property name="icon-name">tuba-trash-symbolic</property>
+				<property name="icon-name">user-trash-symbolic</property>
 				<property name="valign">center</property>
 				<property name="margin-start">6</property>
 				<!-- translators: Forget as in 'Remove Account' -->
diff --git a/src/Dialogs/Composer/AttachmentsPage.vala b/src/Dialogs/Composer/AttachmentsPage.vala
index 2c3972559..6079b7c39 100644
--- a/src/Dialogs/Composer/AttachmentsPage.vala
+++ b/src/Dialogs/Composer/AttachmentsPage.vala
@@ -60,7 +60,7 @@ public class Tuba.AttachmentsPage : ComposerPage {
 	public AttachmentsPage () {
 		Object (
 			title: _("Media"),
-			icon_name: "tuba-clip-attachment-symbolic"
+			icon_name: "mail-attachment-symbolic"
 		);
 
 		populate_filter ();
diff --git a/src/Dialogs/Composer/AttachmentsPageAttachment.vala b/src/Dialogs/Composer/AttachmentsPageAttachment.vala
index fd2c90e6b..5151f4665 100644
--- a/src/Dialogs/Composer/AttachmentsPageAttachment.vala
+++ b/src/Dialogs/Composer/AttachmentsPageAttachment.vala
@@ -46,7 +46,7 @@ public class Tuba.AttachmentsPageAttachment : Widgets.Attachment.Item {
 		alt_btn.remove_css_class ("flat");
 
 		var delete_button = new Gtk.Button () {
-			icon_name = "tuba-trash-symbolic",
+			icon_name = "user-trash-symbolic",
 			valign = Gtk.Align.CENTER,
 			halign = Gtk.Align.END,
 			hexpand = true,
diff --git a/src/Dialogs/Composer/PollPage.vala b/src/Dialogs/Composer/PollPage.vala
index 2183f5830..84149d3d4 100644
--- a/src/Dialogs/Composer/PollPage.vala
+++ b/src/Dialogs/Composer/PollPage.vala
@@ -6,7 +6,7 @@ public class Tuba.PollPage : ComposerPage {
 
 		construct {
 			delete_button = new Gtk.Button () {
-				icon_name = "tuba-trash-symbolic",
+				icon_name = "user-trash-symbolic",
 				valign = Gtk.Align.CENTER,
 				halign = Gtk.Align.CENTER,
 				css_classes = { "flat", "circular", "error" }
diff --git a/src/Services/Accounts/InstanceAccount.vala b/src/Services/Accounts/InstanceAccount.vala
index 9286b4a00..b01b41989 100644
--- a/src/Services/Accounts/InstanceAccount.vala
+++ b/src/Services/Accounts/InstanceAccount.vala
@@ -195,21 +195,21 @@ public class Tuba.InstanceAccount : API.Account, Streamable {
 				break;
 			case KIND_FAVOURITE:
 				result = {
-					"tuba-starred-symbolic",
+					"starred-symbolic",
 					_("%s favorited your post").printf (actor_name),
 					callback_url
 				};
 				break;
 			case KIND_FOLLOW:
 				result = {
-					"tuba-contact-new-symbolic",
+					"contact-new-symbolic",
 					_("%s now follows you").printf (actor_name),
 					callback_url
 				};
 				break;
 			case KIND_FOLLOW_REQUEST:
 				result = {
-					"tuba-contact-new-symbolic",
+					"contact-new-symbolic",
 					_("%s wants to follow you").printf (actor_name),
 					callback_url
 				};
diff --git a/src/Services/Accounts/Mastodon/Account.vala b/src/Services/Accounts/Mastodon/Account.vala
index 18fdba37f..c06998cdc 100644
--- a/src/Services/Accounts/Mastodon/Account.vala
+++ b/src/Services/Accounts/Mastodon/Account.vala
@@ -23,7 +23,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_HOME = new Place () { // vala-lint=naming-convention
 
-		icon = "tuba-home-symbolic",
+		icon = "user-home-symbolic",
 		title = _("Home"),
 		open_func = win => {
 			//  win.open_view (new Views.Main ());
@@ -110,7 +110,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_LOCAL = new Place () { // vala-lint=naming-convention
 
-		icon = "tuba-network-server-symbolic",
+		icon = "network-server-symbolic",
 		title = _("Local"),
 		open_func = (win) => {
 			win.open_view (set_as_sidebar_item (new Views.Local ()));
@@ -128,7 +128,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_FOLLOW_REQUESTS = new Place () { // vala-lint=naming-convention
 
-		icon = "tuba-address-book-new-symbolic",
+		icon = "address-book-new-symbolic",
 		title = _("Follow Requests"),
 		open_func = (win) => {
 			win.open_view (set_as_sidebar_item (new Views.FollowRequests ()));
diff --git a/src/Views/FollowRequests.vala b/src/Views/FollowRequests.vala
index 103faf5bf..de31993f7 100644
--- a/src/Views/FollowRequests.vala
+++ b/src/Views/FollowRequests.vala
@@ -2,7 +2,7 @@ public class Tuba.Views.FollowRequests : Views.Timeline {
     construct {
         url = "/api/v1/follow_requests";
         label = _("Follow Requests");
-        icon = "tuba-address-book-new-symbolic";
+        icon = "address-book-new-symbolic";
         accepts = typeof (API.Account);
     }
 
diff --git a/src/Views/Home.vala b/src/Views/Home.vala
index 3d5adb657..87177ea3a 100644
--- a/src/Views/Home.vala
+++ b/src/Views/Home.vala
@@ -3,7 +3,7 @@ public class Tuba.Views.Home : Views.Timeline {
     construct {
         url = "/api/v1/timelines/home";
         label = _("Home");
-        icon = "tuba-home-symbolic";
+        icon = "user-home-symbolic";
 
         scroll_to_top_rev.margin_end = 32;
         scroll_to_top_rev.margin_bottom = 80;
diff --git a/src/Views/Lists.vala b/src/Views/Lists.vala
index e35449d16..7765cdd09 100644
--- a/src/Views/Lists.vala
+++ b/src/Views/Lists.vala
@@ -16,7 +16,7 @@ public class Tuba.Views.Lists : Views.Timeline {
 			};
 
 			delete_button = new Gtk.Button () {
-				icon_name = "tuba-trash-symbolic",
+				icon_name = "user-trash-symbolic",
 				valign = Gtk.Align.CENTER,
 				halign = Gtk.Align.CENTER,
 				css_classes = { "flat", "circular", "error" }
diff --git a/src/Views/MediaViewer.vala b/src/Views/MediaViewer.vala
index 5764bafdd..e4f2a4ad7 100644
--- a/src/Views/MediaViewer.vala
+++ b/src/Views/MediaViewer.vala
@@ -213,11 +213,11 @@ public class Tuba.Views.MediaViewer : Gtk.Box {
 		set {
 			if (value) {
 				app.main_window.fullscreen ();
-				fullscreen_btn.icon_name = "tuba-view-restore-symbolic";
+				fullscreen_btn.icon_name = "view-restore-symbolic";
 				_fullscreen = true;
 			} else {
 				app.main_window.unfullscreen ();
-				fullscreen_btn.icon_name = "tuba-view-fullscreen-symbolic";
+				fullscreen_btn.icon_name = "view-fullscreen-symbolic";
 				_fullscreen = false;
 			}
 		}
@@ -304,14 +304,14 @@ public class Tuba.Views.MediaViewer : Gtk.Box {
 		headerbar.pack_start (back_btn);
 
 		var end_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-		fullscreen_btn = new Gtk.Button.from_icon_name ("tuba-view-fullscreen-symbolic") {
+		fullscreen_btn = new Gtk.Button.from_icon_name ("view-fullscreen-symbolic") {
 			tooltip_text = _("Toggle Fullscreen")
 		};
 		fullscreen_btn.clicked.connect (toggle_fullscreen);
 
 		var menu_model = create_actions_menu ();
 		var actions_btn = new Gtk.MenuButton () {
-			icon_name = "tuba-view-more-symbolic",
+			icon_name = "view-more-symbolic",
 			menu_model = menu_model
 		};
 
diff --git a/src/Views/Profile.vala b/src/Views/Profile.vala
index 9026307e1..06f3aab2a 100644
--- a/src/Views/Profile.vala
+++ b/src/Views/Profile.vala
@@ -117,7 +117,7 @@ public class Tuba.Views.Profile : Views.Timeline {
 		var menu = "profile-menu";
 		menu_button.menu_model = menu_builder.get_object (menu) as MenuModel;
 		menu_button.popover.width_request = 250;
-		menu_button.icon_name = "tuba-view-more-symbolic";
+		menu_button.icon_name = "view-more-symbolic";
 		header.pack_end (menu_button);
 
 		if (profile.account.is_self ()) {
@@ -369,7 +369,7 @@ public class Tuba.Views.Profile : Views.Timeline {
 		};
 
 		var no_lists_page = new Adw.StatusPage () {
-			icon_name = "tuba-error-symbolic",
+			icon_name = "dialog-error-symbolic",
 			vexpand = true,
 			title = _("You don't have any lists")
 		};
diff --git a/src/Views/StatusStats.vala b/src/Views/StatusStats.vala
index ea236c45a..5afa4fb93 100644
--- a/src/Views/StatusStats.vala
+++ b/src/Views/StatusStats.vala
@@ -10,7 +10,7 @@ public class Tuba.Views.StatusStats : Views.TabbedBase {
 		favorited = add_timeline_tab (
 			// translators: title for a list of people that favorited a post
 			_("Favorited By"),
-			"tuba-starred-symbolic",
+			"starred-symbolic",
 			@"/api/v1/statuses/$(status_id)/favourited_by",
 			typeof (API.Account)
 		);
diff --git a/src/Widgets/ProfileCover.vala b/src/Widgets/ProfileCover.vala
index 2b8b0b867..cdd9b8d5f 100644
--- a/src/Widgets/ProfileCover.vala
+++ b/src/Widgets/ProfileCover.vala
@@ -153,7 +153,7 @@ protected class Tuba.Widgets.Cover : Gtk.Box {
 
             info.append (row);
             row.add_suffix (val);
-            row.add_prefix (new Gtk.Image.from_icon_name ("tuba-contact-new-symbolic"));
+            row.add_prefix (new Gtk.Image.from_icon_name ("contact-new-symbolic"));
         }
 
         build_profile_stats (profile.account);
diff --git a/src/Widgets/Status/ActionsRow.vala b/src/Widgets/Status/ActionsRow.vala
index e2c08568b..e9c79af20 100644
--- a/src/Widgets/Status/ActionsRow.vala
+++ b/src/Widgets/Status/ActionsRow.vala
@@ -82,7 +82,7 @@ public class Tuba.Widgets.ActionsRow : Gtk.Box {
 		this.append (reblog_button);
 
 		favorite_button = new StatusActionButton.with_icon_name ("tuba-unstarred-symbolic") {
-			active_icon_name = "tuba-starred-symbolic",
+			active_icon_name = "starred-symbolic",
 			css_classes = { "ttl-status-action-star", "flat", "circular" },
 			halign = Gtk.Align.START,
 			hexpand = true,