From 35d243791418343e346917a3f3ee21790525c686 Mon Sep 17 00:00:00 2001
From: Evan Paterakis <evan@geopjr.dev>
Date: Sun, 5 May 2024 23:32:53 +0300
Subject: [PATCH] feat: bundle all icons

---
 data/gresource.xml                            | 28 +++++++++++++++++++
 .../tuba-address-book-new-symbolic.svg        |  4 +++
 .../tuba-arrows-pointing-inward-symbolic.svg  |  2 ++
 .../tuba-arrows-pointing-outward-symbolic.svg |  2 ++
 .../tuba-audio-volume-muted-symbolic.svg      |  7 +++++
 .../actions/tuba-check-plain-symbolic.svg     |  2 ++
 .../tuba-checkbox-checked-symbolic.svg        |  4 +++
 .../actions/tuba-contact-new-symbolic.svg     |  4 +++
 .../scalable/actions/tuba-copy-symbolic.svg   |  2 ++
 .../actions/tuba-edit-find-symbolic.svg       |  4 +++
 .../scalable/actions/tuba-edit-symbolic.svg   |  2 ++
 .../actions/tuba-go-next-symbolic.svg         |  4 +++
 .../actions/tuba-go-previous-symbolic.svg     |  4 +++
 .../scalable/actions/tuba-go-top-symbolic.svg |  4 +++
 .../actions/tuba-mail-attachment-symbolic.svg |  4 +++
 .../actions/tuba-mail-unread-symbolic.svg     |  7 +++++
 .../actions/tuba-menu-large-symbolic.svg      |  2 ++
 .../tuba-minus-circle-filled-symbolic.svg     |  2 ++
 .../actions/tuba-network-server-symbolic.svg  | 10 +++++++
 ...tuba-network-wireless-offline-symbolic.svg |  7 +++++
 .../actions/tuba-play-large-symbolic.svg      |  2 ++
 .../actions/tuba-radio-checked-symbolic.svg   |  4 +++
 .../actions/tuba-starred-symbolic.svg         |  4 +++
 .../actions/tuba-user-home-symbolic.svg       |  7 +++++
 .../actions/tuba-user-trash-symbolic.svg      | 10 +++++++
 .../tuba-view-more-horizontal-symbolic.svg    |  4 +++
 .../actions/tuba-view-more-symbolic.svg       |  4 +++
 .../actions/tuba-zoom-in-symbolic.svg         |  4 +++
 .../actions/tuba-zoom-out-symbolic.svg        |  4 +++
 data/ui/dialogs/new_account.ui                |  2 +-
 data/ui/dialogs/profile_edit.ui               |  4 +--
 data/ui/menus.ui                              |  4 +--
 data/ui/views/base.ui                         |  2 +-
 data/ui/views/media_viewer.ui                 | 12 ++++----
 data/ui/views/sidebar/account.ui              |  4 +--
 data/ui/views/sidebar/view.ui                 |  2 +-
 data/ui/widgets/status.ui                     |  2 +-
 src/Dialogs/Composer/AttachmentsPage.vala     |  2 +-
 .../Composer/AttachmentsPageAttachment.vala   |  2 +-
 src/Dialogs/Composer/EditorPage.vala          |  2 +-
 src/Dialogs/Composer/PollPage.vala            |  6 ++--
 src/Dialogs/FilterEdit.vala                   |  2 +-
 src/Dialogs/Offline.vala                      |  2 +-
 src/Dialogs/Preferences.vala                  |  4 +--
 src/Services/Accounts/InstanceAccount.vala    |  8 +++---
 src/Services/Accounts/Mastodon/Account.vala   | 10 +++----
 src/Views/Conversations.vala                  |  2 +-
 src/Views/EditHistory.vala                    |  2 +-
 src/Views/FollowRequests.vala                 |  2 +-
 src/Views/Home.vala                           |  4 +--
 src/Views/Lists.vala                          |  4 +--
 src/Views/MediaViewer.vala                    |  4 +--
 src/Views/MutesBlocks.vala                    |  2 +-
 src/Views/Profile.vala                        |  6 ++--
 src/Views/StatusStats.vala                    |  2 +-
 src/Widgets/Attachment/Image.vala             |  2 +-
 src/Widgets/PreviewCard.vala                  |  4 +--
 src/Widgets/ProfileCover.vala                 |  2 +-
 src/Widgets/Status/ActionsRow.vala            |  2 +-
 59 files changed, 202 insertions(+), 54 deletions(-)
 create mode 100644 data/icons/scalable/actions/tuba-address-book-new-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-arrows-pointing-inward-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-arrows-pointing-outward-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-audio-volume-muted-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-check-plain-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-checkbox-checked-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-contact-new-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-copy-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-edit-find-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-edit-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-go-next-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-go-previous-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-go-top-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-mail-attachment-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-mail-unread-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-menu-large-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-minus-circle-filled-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-network-server-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-network-wireless-offline-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-play-large-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-radio-checked-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-starred-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-user-home-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-user-trash-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-view-more-horizontal-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-view-more-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-zoom-in-symbolic.svg
 create mode 100644 data/icons/scalable/actions/tuba-zoom-out-symbolic.svg

diff --git a/data/gresource.xml b/data/gresource.xml
index be8c1ded9..97df3ed23 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -62,6 +62,34 @@
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-sad-computer-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-background-app-ghost-symbolic.svg</file>
         <!-- <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-language-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-arrows-pointing-inward-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-arrows-pointing-outward-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-audio-volume-muted-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-check-plain-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-checkbox-checked-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-contact-new-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-copy-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-edit-find-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-edit-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-go-next-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-go-previous-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-go-top-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-mail-attachment-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-mail-unread-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-menu-large-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-minus-circle-filled-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-network-server-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-network-wireless-offline-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-play-large-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-radio-checked-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-starred-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-user-home-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-user-trash-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-view-more-horizontal-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-view-more-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-zoom-in-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-zoom-out-symbolic.svg</file>
 
         <file>gtk/help-overlay.ui</file>
         <file>gtk/dropdown/content_type_title.ui</file>
diff --git a/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg b/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg
new file mode 100644
index 000000000..3904b83f3
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-address-book-new-symbolic.svg
@@ -0,0 +1,4 @@
+<?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-arrows-pointing-inward-symbolic.svg b/data/icons/scalable/actions/tuba-arrows-pointing-inward-symbolic.svg
new file mode 100644
index 000000000..e86ba5ccb
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-arrows-pointing-inward-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"><g fill="#222222"><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/icons/scalable/actions/tuba-arrows-pointing-outward-symbolic.svg b/data/icons/scalable/actions/tuba-arrows-pointing-outward-symbolic.svg
new file mode 100644
index 000000000..4a2c27cbe
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-arrows-pointing-outward-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"><g fill="#222222"><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-audio-volume-muted-symbolic.svg b/data/icons/scalable/actions/tuba-audio-volume-muted-symbolic.svg
new file mode 100644
index 000000000..4741df555
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-audio-volume-muted-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 7 1.007812 c -0.296875 -0.003906 -0.578125 0.125 -0.769531 0.351563 l -3.230469 3.640625 h -1 c -1.09375 0 -2 0.84375 -2 2 v 2 c 0 1.089844 0.910156 2 2 2 h 1 l 3.230469 3.640625 c 0.210937 0.253906 0.492187 0.363281 0.769531 0.359375 z m 0 0"/>
+        <path d="m 10 5 c -0.265625 0 -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 1.292969 1.292969 l -1.292969 1.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 1.292969 -1.292969 l 1.292969 1.292969 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -1.292969 -1.292969 l 1.292969 -1.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 -1.292969 1.292969 l -1.292969 -1.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-check-plain-symbolic.svg b/data/icons/scalable/actions/tuba-check-plain-symbolic.svg
new file mode 100644
index 000000000..096db0780
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-check-plain-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 13.753906 4.65625 c 0.175782 -0.199219 0.261719 -0.460938 0.246094 -0.722656 c -0.019531 -0.265625 -0.140625 -0.511719 -0.339844 -0.6875 c -0.199218 -0.175782 -0.460937 -0.265625 -0.726562 -0.246094 c -0.265625 0.015625 -0.511719 0.140625 -0.6875 0.339844 l -6.296875 7.195312 l -2.242188 -2.246094 c -0.390625 -0.390624 -1.023437 -0.390624 -1.414062 0 c -0.1875 0.1875 -0.292969 0.445313 -0.292969 0.710938 s 0.105469 0.519531 0.292969 0.707031 l 3 3 c 0.195312 0.195313 0.464843 0.300781 0.742187 0.292969 c 0.277344 -0.011719 0.535156 -0.132812 0.71875 -0.34375 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-checkbox-checked-symbolic.svg b/data/icons/scalable/actions/tuba-checkbox-checked-symbolic.svg
new file mode 100644
index 000000000..47cc24c67
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-checkbox-checked-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 3 0 c -1.644531 0 -3 1.355469 -3 3 v 10 c 0 1.644531 1.355469 3 3 3 h 10 c 1.644531 0 3 -1.355469 3 -3 v -10 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 10 c 0.421875 0 0.765625 0.234375 0.917969 0.585938 l -0.667969 0.757812 l -6.296875 7.195312 l -2.246094 -2.246093 c -0.390625 -0.390625 -1.023437 -0.390625 -1.414062 0 s -0.390625 1.027343 0 1.417969 l 3 3 c 0.410156 0.40625 1.078125 0.386718 1.460937 -0.050782 l 6.246094 -7.136718 v 7.476562 c 0 0.570312 -0.429688 1 -1 1 h -10 c -0.570312 0 -1 -0.429688 -1 -1 v -10 c 0 -0.570312 0.429688 -1 1 -1 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
new file mode 100644
index 000000000..bff976f21
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-contact-new-symbolic.svg
@@ -0,0 +1,4 @@
+<?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-copy-symbolic.svg b/data/icons/scalable/actions/tuba-copy-symbolic.svg
new file mode 100644
index 000000000..7aad5a3e8
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-copy-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 0 3 c 0 -1.644531 1.355469 -3 3 -3 h 5 c 1.644531 0 3 1.355469 3 3 c 0 0.550781 -0.449219 1 -1 1 s -1 -0.449219 -1 -1 c 0 -0.570312 -0.429688 -1 -1 -1 h -5 c -0.570312 0 -1 0.429688 -1 1 v 5 c 0 0.570312 0.429688 1 1 1 c 0.550781 0 1 0.449219 1 1 s -0.449219 1 -1 1 c -1.644531 0 -3 -1.355469 -3 -3 z m 5 5 c 0 -1.644531 1.355469 -3 3 -3 h 5 c 1.644531 0 3 1.355469 3 3 v 5 c 0 1.644531 -1.355469 3 -3 3 h -5 c -1.644531 0 -3 -1.355469 -3 -3 z m 2 0 v 5 c 0 0.570312 0.429688 1 1 1 h 5 c 0.570312 0 1 -0.429688 1 -1 v -5 c 0 -0.570312 -0.429688 -1 -1 -1 h -5 c -0.570312 0 -1 0.429688 -1 1 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-edit-find-symbolic.svg b/data/icons/scalable/actions/tuba-edit-find-symbolic.svg
new file mode 100644
index 000000000..da9a076ba
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-edit-find-symbolic.svg
@@ -0,0 +1,4 @@
+<?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.5 0 c -3.578125 0 -6.5 2.921875 -6.5 6.5 s 2.921875 6.5 6.5 6.5 c 1.429688 0 2.753906 -0.46875 3.828125 -1.257812 l 2.945313 2.945312 c 0.957031 0.9375 2.363281 -0.5 1.40625 -1.4375 l -2.929688 -2.929688 c 0.785156 -1.074218 1.25 -2.394531 1.25 -3.820312 c 0 -3.578125 -2.921875 -6.5 -6.5 -6.5 z m 0 2 c 2.496094 0 4.5 2.003906 4.5 4.5 s -2.003906 4.5 -4.5 4.5 s -4.5 -2.003906 -4.5 -4.5 s 2.003906 -4.5 4.5 -4.5 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-edit-symbolic.svg b/data/icons/scalable/actions/tuba-edit-symbolic.svg
new file mode 100644
index 000000000..51090b910
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-edit-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 12.277344 0.832031 c -0.578125 0.007813 -1.167969 0.230469 -1.691406 0.753907 l -9 9 c -0.375 0.375 -0.585938 0.882812 -0.585938 1.414062 v 3 h 3 c 0.53125 0 1.039062 -0.210938 1.414062 -0.585938 l 9 -9 c 1.789063 -1.789062 0.082032 -4.390624 -1.890624 -4.570312 c -0.082032 -0.011719 -0.164063 -0.011719 -0.246094 -0.011719 z m -1.777344 3.605469 l 1.0625 1.0625 l -7.0625 7.0625 l -1.0625 -1.0625 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-go-next-symbolic.svg b/data/icons/scalable/actions/tuba-go-next-symbolic.svg
new file mode 100644
index 000000000..0ff48beeb
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-go-next-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 4 2 c 0 -0.265625 0.105469 -0.519531 0.292969 -0.707031 c 0.390625 -0.390625 1.023437 -0.390625 1.414062 0 l 6 6 c 0.1875 0.1875 0.292969 0.441406 0.292969 0.707031 s -0.105469 0.519531 -0.292969 0.707031 l -6 6 c -0.390625 0.390625 -1.023437 0.390625 -1.414062 0 c -0.1875 -0.1875 -0.292969 -0.441406 -0.292969 -0.707031 s 0.105469 -0.519531 0.292969 -0.707031 l 5.292969 -5.292969 l -5.292969 -5.292969 c -0.1875 -0.1875 -0.292969 -0.441406 -0.292969 -0.707031 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-go-previous-symbolic.svg b/data/icons/scalable/actions/tuba-go-previous-symbolic.svg
new file mode 100644
index 000000000..1b7901fce
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-go-previous-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 12 2 c 0 -0.265625 -0.105469 -0.519531 -0.292969 -0.707031 c -0.390625 -0.390625 -1.023437 -0.390625 -1.414062 0 l -6 6 c -0.1875 0.1875 -0.292969 0.441406 -0.292969 0.707031 s 0.105469 0.519531 0.292969 0.707031 l 6 6 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 c 0.1875 -0.1875 0.292969 -0.441406 0.292969 -0.707031 s -0.105469 -0.519531 -0.292969 -0.707031 l -5.292969 -5.292969 l 5.292969 -5.292969 c 0.1875 -0.1875 0.292969 -0.441406 0.292969 -0.707031 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-go-top-symbolic.svg b/data/icons/scalable/actions/tuba-go-top-symbolic.svg
new file mode 100644
index 000000000..a4959fbdd
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-go-top-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 1 3 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 6.84375 2.011719 c -0.207031 0.03125 -0.402344 0.128906 -0.550781 0.28125 l -6 6 c -0.1875 0.1875 -0.292969 0.441406 -0.292969 0.707031 s 0.105469 0.519531 0.292969 0.707031 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 5.292969 -5.292969 l 5.292969 5.292969 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 c 0.1875 -0.1875 0.292969 -0.441406 0.292969 -0.707031 s -0.105469 -0.519531 -0.292969 -0.707031 l -6 -6 c -0.226562 -0.226563 -0.546875 -0.332031 -0.863281 -0.28125 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-mail-attachment-symbolic.svg b/data/icons/scalable/actions/tuba-mail-attachment-symbolic.svg
new file mode 100644
index 000000000..4c25cccb5
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-mail-attachment-symbolic.svg
@@ -0,0 +1,4 @@
+<?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-mail-unread-symbolic.svg b/data/icons/scalable/actions/tuba-mail-unread-symbolic.svg
new file mode 100644
index 000000000..27fafb950
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-mail-unread-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 1.800781 3.019531 c -0.257812 0.050781 -0.484375 0.207031 -0.632812 0.425781 c -0.304688 0.460938 -0.183594 1.082032 0.277343 1.386719 l 5.167969 3.445313 c 0.835938 0.558594 1.9375 0.558594 2.773438 0 l 5.167969 -3.445313 c 0.460937 -0.304687 0.582031 -0.925781 0.277343 -1.386719 c -0.304687 -0.460937 -0.925781 -0.582031 -1.386719 -0.277343 l -5.167968 3.445312 c -0.171875 0.113281 -0.382813 0.113281 -0.554688 0 l -5.167968 -3.445312 c -0.222657 -0.148438 -0.492188 -0.199219 -0.753907 -0.148438 z m 0 0"/>
+        <path d="m 3 2 c -1.644531 0 -3 1.355469 -3 3 v 6 c 0 1.644531 1.355469 3 3 3 h 10 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 10 c 0.570312 0 1 0.429688 1 1 v 6 c 0 0.570312 -0.429688 1 -1 1 h -10 c -0.570312 0 -1 -0.429688 -1 -1 v -6 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-menu-large-symbolic.svg b/data/icons/scalable/actions/tuba-menu-large-symbolic.svg
new file mode 100644
index 000000000..38fb836a9
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-menu-large-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"><g fill="#222222"><path d="m 1 2 h 14 v 2 h -14 z m 0 0"/><path d="m 1 7 h 14 v 2 h -14 z m 0 0"/><path d="m 1 12 h 14 v 2 h -14 z m 0 0"/></g></svg>
diff --git a/data/icons/scalable/actions/tuba-minus-circle-filled-symbolic.svg b/data/icons/scalable/actions/tuba-minus-circle-filled-symbolic.svg
new file mode 100644
index 000000000..f59390758
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-minus-circle-filled-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 8 1 c -3.871094 0 -7 3.128906 -7 7 s 3.128906 7 7 7 s 7 -3.128906 7 -7 s -3.128906 -7 -7 -7 z m -4 6 h 8 v 2 h -8 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-network-server-symbolic.svg b/data/icons/scalable/actions/tuba-network-server-symbolic.svg
new file mode 100644
index 000000000..74702b7a4
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-network-server-symbolic.svg
@@ -0,0 +1,10 @@
+<?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 7.996094 12 c -0.703125 0 -1.355469 0.371094 -1.714844 0.972656 h -3.285156 c -0.554688 0 -1 0.449219 -1 1 c 0 0.550782 0.445312 1 1 1 h 3.246094 c 0.351562 0.640625 1.023437 1.035156 1.753906 1.039063 c 0.726562 -0.003907 1.398437 -0.398438 1.75 -1.039063 h 3.261718 c 0.550782 0 1 -0.449218 1 -1 c 0 -0.550781 -0.449218 -1 -1 -1 h -3.292968 c -0.363282 -0.601562 -1.015625 -0.972656 -1.71875 -0.972656 z m 0 1 c 0.554687 0 1.003906 0.449219 1.003906 1.007812 c 0 0.554688 -0.449219 1.003907 -1.003906 1.003907 c -0.558594 0 -1.007813 -0.449219 -1.007813 -1.003907 c 0 -0.558593 0.449219 -1.007812 1.007813 -1.007812 z m 0 0"/>
+        <path d="m 6.992188 10 h 2.007812 v 3 h -2.007812 z m 0 0"/>
+        <path d="m 11.992188 2 c 1.113281 0 2.007812 0.894531 2.007812 2.007812 v 2.972657 c 0 1.109375 -0.894531 2.003906 -2.007812 2.003906 h -7.984376 c -1.113281 0 -2.007812 -0.894531 -2.007812 -2.003906 v -2.972657 c 0 -1.113281 0.894531 -2.007812 2.007812 -2.007812 z m -11.992188 2.007812 v 2.972657 c 0 2.21875 1.789062 4.003906 4.007812 4.003906 h 7.984376 c 2.21875 0 4.007812 -1.785156 4.007812 -4.003906 v -2.972657 c 0 -2.21875 -1.789062 -4.007812 -4.007812 -4.007812 h -7.984376 c -2.21875 0 -4.007812 1.789062 -4.007812 4.007812 z m 0 0"/>
+        <path d="m 5 4 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 8 4 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"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-network-wireless-offline-symbolic.svg b/data/icons/scalable/actions/tuba-network-wireless-offline-symbolic.svg
new file mode 100644
index 000000000..97f18154b
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-network-wireless-offline-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 8 1.992188 c -2.617188 0 -5.238281 0.933593 -7.195312 2.808593 l -0.496094 0.480469 c -0.3984378 0.378906 -0.410156 1.011719 -0.03125 1.410156 c 0.382812 0.398438 1.015625 0.410156 1.414062 0.03125 l 0.5 -0.476562 c 3.085938 -2.957032 8.53125 -2.957032 11.617188 0 l 0.5 0.476562 c 0.398437 0.378906 1.03125 0.367188 1.414062 -0.03125 c 0.378906 -0.398437 0.367188 -1.03125 -0.03125 -1.410156 l -0.496094 -0.480469 c -1.957031 -1.875 -4.578124 -2.808593 -7.195312 -2.808593 z m -0.03125 4.007812 c -1.570312 0.011719 -3.128906 0.628906 -4.207031 1.8125 l -0.5 0.550781 c -0.375 0.40625 -0.347657 1.042969 0.0625 1.414063 c 0.410156 0.371094 1.042969 0.339844 1.414062 -0.070313 l 0.5 -0.546875 c 1.242188 -1.359375 3.992188 -1.488281 5.398438 -0.125 c 0.121093 -0.023437 0.242187 -0.035156 0.363281 -0.035156 c 0.53125 0 1.039062 0.210938 1.414062 0.585938 l 0.222657 0.222656 c 0.011719 -0.011719 0.023437 -0.019532 0.035156 -0.03125 c 0.410156 -0.371094 0.441406 -1.007813 0.066406 -1.414063 l -0.5 -0.550781 c -1.125 -1.230469 -2.703125 -1.824219 -4.269531 -1.8125 z m 0.03125 4 c -0.511719 0 -1.023438 0.195312 -1.414062 0.585938 c -0.78125 0.78125 -0.78125 2.046874 0 2.828124 s 2.046874 0.78125 2.828124 0 c 0.210938 -0.210937 0.359376 -0.453124 0.457032 -0.714843 l -0.285156 -0.285157 c -0.554688 -0.554687 -0.707032 -1.367187 -0.46875 -2.070312 c -0.335938 -0.226562 -0.726563 -0.34375 -1.117188 -0.34375 z m 0 0" fill-opacity="0.34902"/>
+        <path d="m 11 10 c -0.265625 0 -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 1.292969 1.292969 l -1.292969 1.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 1.292969 -1.292969 l 1.292969 1.292969 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -1.292969 -1.292969 l 1.292969 -1.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 -1.292969 1.292969 l -1.292969 -1.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-play-large-symbolic.svg b/data/icons/scalable/actions/tuba-play-large-symbolic.svg
new file mode 100644
index 000000000..5210a7e44
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-play-large-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 2.003906 13.492188 v -11 c 0 -1.5 1.265625 -1.492188 1.265625 -1.492188 h 0.132813 c 0.246094 0 0.484375 0.054688 0.699218 0.175781 l 9.796876 5.597657 c 0.433593 0.238281 0.65625 0.730468 0.65625 1.222656 c 0 0.492187 -0.222657 0.984375 -0.65625 1.226562 l -9.796876 5.597656 c -0.214843 0.121094 -0.453124 0.175782 -0.699218 0.171876 h -0.132813 s -1.265625 0 -1.265625 -1.5 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/scalable/actions/tuba-radio-checked-symbolic.svg b/data/icons/scalable/actions/tuba-radio-checked-symbolic.svg
new file mode 100644
index 000000000..d456c1e05
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-radio-checked-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 -4.40625 0 -8 3.59375 -8 8 s 3.59375 8 8 8 s 8 -3.59375 8 -8 s -3.59375 -8 -8 -8 z m 0 2 c 3.320312 0 6 2.679688 6 6 s -2.679688 6 -6 6 s -6 -2.679688 -6 -6 s 2.679688 -6 6 -6 z m -0.007812 3 c -1.652344 0 -3 1.34375 -3 3 s 1.347656 3 3 3 c 1.65625 0 3 -1.34375 3 -3 s -1.34375 -3 -3 -3 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-starred-symbolic.svg b/data/icons/scalable/actions/tuba-starred-symbolic.svg
new file mode 100644
index 000000000..9249d421d
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-starred-symbolic.svg
@@ -0,0 +1,4 @@
+<?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-user-home-symbolic.svg b/data/icons/scalable/actions/tuba-user-home-symbolic.svg
new file mode 100644
index 000000000..59203ca9d
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-user-home-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 12 16 c 1.660156 0 3 -1.339844 3 -3 v -6 c 0 -0.929688 -0.414062 -1.8125 -1.128906 -2.410156 l -4.460938 -3.71875 c -0.816406 -0.679688 -2.003906 -0.679688 -2.820312 0 l -4.460938 3.71875 c -0.714844 0.597656 -1.128906 1.480468 -1.128906 2.410156 v 6 c 0 1.660156 1.339844 3 3 3 z m -9 -3 v -6 c 0 -0.335938 0.148438 -0.65625 0.410156 -0.871094 l 4.460938 -3.71875 c 0.074218 -0.0625 0.183594 -0.0625 0.257812 0 l 4.460938 3.71875 c 0.261718 0.214844 0.410156 0.535156 0.410156 0.871094 v 6 c 0 0.546875 -0.453125 1 -1 1 h -8 c -0.546875 0 -1 -0.453125 -1 -1 z m 0 0"/>
+        <path d="m 7 8 h 2 c 0.550781 0 1 0.449219 1 1 v 5 c 0 0.550781 -0.449219 1 -1 1 h -2 c -0.550781 0 -1 -0.449219 -1 -1 v -5 c 0 -0.550781 0.449219 -1 1 -1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-user-trash-symbolic.svg b/data/icons/scalable/actions/tuba-user-trash-symbolic.svg
new file mode 100644
index 000000000..b6f8bd1db
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-user-trash-symbolic.svg
@@ -0,0 +1,10 @@
+<?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-more-horizontal-symbolic.svg b/data/icons/scalable/actions/tuba-view-more-horizontal-symbolic.svg
new file mode 100644
index 000000000..b51458a33
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-view-more-horizontal-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 2 6.007812 c -1.105469 0 -2 0.894532 -2 2 c 0 1.101563 0.894531 2 2 2 s 2 -0.898437 2 -2 c 0 -1.105468 -0.894531 -2 -2 -2 z m 6 0 c -1.105469 0 -2 0.894532 -2 2 c 0 1.101563 0.894531 2 2 2 s 2 -0.898437 2 -2 c 0 -1.105468 -0.894531 -2 -2 -2 z m 6 0 c -1.105469 0 -2 0.894532 -2 2 c 0 1.101563 0.894531 2 2 2 s 2 -0.898437 2 -2 c 0 -1.105468 -0.894531 -2 -2 -2 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-view-more-symbolic.svg b/data/icons/scalable/actions/tuba-view-more-symbolic.svg
new file mode 100644
index 000000000..9bb567fc7
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-view-more-symbolic.svg
@@ -0,0 +1,4 @@
+<?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-zoom-in-symbolic.svg b/data/icons/scalable/actions/tuba-zoom-in-symbolic.svg
new file mode 100644
index 000000000..818bc69d6
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-zoom-in-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 4 1 c -1.660156 0 -3 1.339844 -3 3 v 8 c 0 1.660156 1.339844 3 3 3 h 8 c 1.660156 0 3 -1.339844 3 -3 v -8 c 0 -1.660156 -1.339844 -3 -3 -3 z m 3 3 h 2 v 3 h 3 v 2 h -3 v 3 h -2 v -3 h -3 v -2 h 3 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/tuba-zoom-out-symbolic.svg b/data/icons/scalable/actions/tuba-zoom-out-symbolic.svg
new file mode 100644
index 000000000..b40f0b27e
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-zoom-out-symbolic.svg
@@ -0,0 +1,4 @@
+<?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 4 1 c -1.660156 0 -3 1.339844 -3 3 v 8 c 0 1.660156 1.339844 3 3 3 h 8 c 1.660156 0 3 -1.339844 3 -3 v -8 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 6 h 8 v 2 h -8 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/ui/dialogs/new_account.ui b/data/ui/dialogs/new_account.ui
index 006c081f6..bf502877b 100644
--- a/data/ui/dialogs/new_account.ui
+++ b/data/ui/dialogs/new_account.ui
@@ -40,7 +40,7 @@
                 <property name="content">
                   <object class="AdwStatusPage">
                     <property name="vexpand">1</property>
-                    <property name="icon_name">network-server-symbolic</property>
+                    <property name="icon_name">tuba-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>
diff --git a/data/ui/dialogs/profile_edit.ui b/data/ui/dialogs/profile_edit.ui
index 6f88ab3c8..cc1d713f8 100644
--- a/data/ui/dialogs/profile_edit.ui
+++ b/data/ui/dialogs/profile_edit.ui
@@ -63,7 +63,7 @@
                             </property>
                             <child type="overlay">
                               <object class="GtkButton">
-                                <property name="icon-name">document-edit-symbolic</property>
+                                <property name="icon-name">tuba-edit-symbolic</property>
                                 <property name="tooltip-text" translatable="yes">Edit Profile Picture</property>
                                 <property name="valign">center</property>
                                 <property name="halign">center</property>
@@ -91,7 +91,7 @@
                             </property>
                             <child type="overlay">
                               <object class="GtkButton">
-                                <property name="icon-name">document-edit-symbolic</property>
+                                <property name="icon-name">tuba-edit-symbolic</property>
                                 <!-- translators: if unsure take a look at Mastodon https://github.com/mastodon/mastodon/blob/main/config/locales/ (under simple_form) -->
                                 <property name="tooltip-text" translatable="yes">Edit Header Picture</property>
                                 <property name="valign">start</property>
diff --git a/data/ui/menus.ui b/data/ui/menus.ui
index 76a1c2965..643bbfaf1 100644
--- a/data/ui/menus.ui
+++ b/data/ui/menus.ui
@@ -16,12 +16,12 @@
         <attribute name="label" translatable="yes">Direct Message</attribute>
         <attribute name="action">view.mention</attribute>
         <attribute name="target">direct</attribute>
-        <attribute name="verb-icon">mail-unread-symbolic</attribute>
+        <attribute name="verb-icon">tuba-mail-unread-symbolic</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">Copy Handle</attribute>
         <attribute name="action">view.copy_handle</attribute>
-        <attribute name="verb-icon">edit-copy-symbolic</attribute>
+        <attribute name="verb-icon">tuba-copy-symbolic</attribute>
       </item>
     </section>
 
diff --git a/data/ui/views/base.ui b/data/ui/views/base.ui
index 61d7626b6..6e95a343c 100644
--- a/data/ui/views/base.ui
+++ b/data/ui/views/base.ui
@@ -32,7 +32,7 @@
                 <property name="overflow">visible</property>
                 <property name="child">
                   <object class="GtkButton" id="scroll_to_top">
-                    <property name="icon-name">go-top-symbolic</property>
+                    <property name="icon-name">tuba-go-top-symbolic</property>
                     <style>
                       <class name="circular" />
                       <class name="osd" />
diff --git a/data/ui/views/media_viewer.ui b/data/ui/views/media_viewer.ui
index 88f8401ae..3eff07be2 100644
--- a/data/ui/views/media_viewer.ui
+++ b/data/ui/views/media_viewer.ui
@@ -55,14 +55,14 @@
 								<child type="end">
 									<object class="GtkMenuButton">
 										<property name="menu-model">menu-model</property>
-										<property name="icon-name">view-more-symbolic</property>
+										<property name="icon-name">tuba-view-more-symbolic</property>
 										<property name="tooltip-text" translatable="yes">Menu</property>
 										<property name="primary">1</property>
 									</object>
 								</child>
 								<child type="end">
 									<object class="GtkButton" id="fullscreen_btn">
-										<property name="icon-name">view-fullscreen-symbolic</property>
+										<property name="icon-name">tuba-arrows-pointing-outward-symbolic</property>
 										<property name="tooltip-text" translatable="yes">Toggle Fullscreen</property>
 										<signal name="clicked" handler="toggle_fullscreen" swapped="no" />
 									</object>
@@ -90,7 +90,7 @@
 														<property name="spacing">12</property>
 														<child>
 															<object class="GtkButton" id="prev_btn">
-																<property name="icon-name">go-previous-symbolic</property>
+																<property name="icon-name">tuba-go-previous-symbolic</property>
 																<property name="tooltip-text" translatable="yes">Previous Attachment</property>
 																<signal name="clicked" handler="on_previous_clicked" swapped="no" />
 																<style>
@@ -102,7 +102,7 @@
 														</child>
 														<child>
 															<object class="GtkButton" id="next_btn">
-																<property name="icon-name">go-next-symbolic</property>
+																<property name="icon-name">tuba-go-next-symbolic</property>
 																<property name="tooltip-text" translatable="yes">Next Attachment</property>
 																<signal name="clicked" handler="on_next_clicked" swapped="no" />
 																<style>
@@ -132,7 +132,7 @@
 														<property name="spacing">12</property>
 														<child>
 															<object class="GtkButton" id="zoom_out_btn">
-																<property name="icon-name">zoom-out-symbolic</property>
+																<property name="icon-name">tuba-zoom-out-symbolic</property>
 																<property name="tooltip-text" translatable="yes">Zoom Out</property>
 																<signal name="clicked" handler="on_zoom_out_clicked" swapped="no" />
 																<style>
@@ -144,7 +144,7 @@
 														</child>
 														<child>
 															<object class="GtkButton" id="zoom_in_btn">
-																<property name="icon-name">zoom-in-symbolic</property>
+																<property name="icon-name">tuba-zoom-in-symbolic</property>
 																<property name="tooltip-text" translatable="yes">Zoom In</property>
 																<signal name="clicked" handler="on_zoom_in_clicked" swapped="no" />
 																<style>
diff --git a/data/ui/views/sidebar/account.ui b/data/ui/views/sidebar/account.ui
index f91c77f92..98df1c2d0 100644
--- a/data/ui/views/sidebar/account.ui
+++ b/data/ui/views/sidebar/account.ui
@@ -20,7 +20,7 @@
 						<property name="focusable">0</property>
 						<property name="halign">end</property>
 						<property name="valign">end</property>
-						<property name="icon-name">emblem-ok-symbolic</property>
+						<property name="icon-name">tuba-check-plain-symbolic</property>
 						<property name="pixel-size">11</property>
 						<style>
 							<class name="blue-checkmark" />
@@ -44,7 +44,7 @@
 
 		<child type="suffix">
 			<object class="GtkButton" id="forget">
-				<property name="icon-name">user-trash-symbolic</property>
+				<property name="icon-name">tuba-user-trash-symbolic</property>
 				<property name="valign">center</property>
 				<property name="margin-start">6</property>
 				<!-- translators: Forget as in 'Remove Account' -->
diff --git a/data/ui/views/sidebar/view.ui b/data/ui/views/sidebar/view.ui
index 4770ea363..058cbd5e0 100644
--- a/data/ui/views/sidebar/view.ui
+++ b/data/ui/views/sidebar/view.ui
@@ -53,7 +53,7 @@
 						</child>
 						<child type="end">
 							<object class="GtkMenuButton" id="menu_btn">
-								<property name="icon-name">open-menu-symbolic</property>
+								<property name="icon-name">tuba-menu-large-symbolic</property>
 								<property name="tooltip_text" translatable="yes">Menu</property>
 								<property name="primary">1</property>
 							</object>
diff --git a/data/ui/widgets/status.ui b/data/ui/widgets/status.ui
index 44b47940f..b3f0e4dfe 100644
--- a/data/ui/widgets/status.ui
+++ b/data/ui/widgets/status.ui
@@ -205,7 +205,7 @@
                             </child>
                             <child>
                               <object class="GtkMenuButton" id="menu_button">
-                                <property name="icon-name">view-more-horizontal-symbolic</property>
+                                <property name="icon-name">tuba-view-more-horizontal-symbolic</property>
                                 <property name="visible">0</property>
                                 <style>
                                   <class name="flat" />
diff --git a/src/Dialogs/Composer/AttachmentsPage.vala b/src/Dialogs/Composer/AttachmentsPage.vala
index cc7b10ac4..a62d00d62 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: "mail-attachment-symbolic"
+			icon_name: "tuba-mail-attachment-symbolic"
 		);
 
 		populate_filter ();
diff --git a/src/Dialogs/Composer/AttachmentsPageAttachment.vala b/src/Dialogs/Composer/AttachmentsPageAttachment.vala
index d44c9f6bb..fc44efd46 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 = "user-trash-symbolic",
+			icon_name = "tuba-user-trash-symbolic",
 			valign = Gtk.Align.CENTER,
 			halign = Gtk.Align.END,
 			hexpand = true,
diff --git a/src/Dialogs/Composer/EditorPage.vala b/src/Dialogs/Composer/EditorPage.vala
index 0c7d3d521..51dd7b96c 100644
--- a/src/Dialogs/Composer/EditorPage.vala
+++ b/src/Dialogs/Composer/EditorPage.vala
@@ -50,7 +50,7 @@ public class Tuba.EditorPage : ComposerPage {
 	construct {
 		//  translators: "Text" as in text-based input
 		title = _("Text");
-		icon_name = "document-edit-symbolic";
+		icon_name = "tuba-edit-symbolic";
 
 		var char_limit_api = accounts.active.instance_info.compat_status_max_characters;
 		if (char_limit_api > 0)
diff --git a/src/Dialogs/Composer/PollPage.vala b/src/Dialogs/Composer/PollPage.vala
index 84149d3d4..a3081e93e 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 = "user-trash-symbolic",
+				icon_name = "tuba-user-trash-symbolic",
 				valign = Gtk.Align.CENTER,
 				halign = Gtk.Align.CENTER,
 				css_classes = { "flat", "circular", "error" }
@@ -117,7 +117,7 @@ public class Tuba.PollPage : ComposerPage {
 		add_poll_action_button.clicked.connect (add_poll_row_without_title);
 
 		var multi_button = new Gtk.ToggleButton () {
-			icon_name = "radio-checked-symbolic",
+			icon_name = "tuba-radio-checked-symbolic",
 			valign = Gtk.Align.CENTER,
 			halign = Gtk.Align.CENTER,
 			tooltip_text = _("Enable Multiple Choice"),
@@ -131,7 +131,7 @@ public class Tuba.PollPage : ComposerPage {
 			(b, src, ref target) => {
 				var multi_button_active = src.get_boolean ();
 				target.set_boolean (multi_button_active);
-				multi_button.icon_name = multi_button_active ? "checkbox-checked-symbolic" : "radio-checked-symbolic";
+				multi_button.icon_name = multi_button_active ? "tuba-checkbox-checked-symbolic" : "tuba-radio-checked-symbolic";
 				// translators: multiple choice as in allow the user to pick multiple poll options
 				multi_button.tooltip_text = multi_button_active ? _("Disable Multiple Choice") : _("Enable Multiple Choice");
 				return true;
diff --git a/src/Dialogs/FilterEdit.vala b/src/Dialogs/FilterEdit.vala
index 4a1b75d90..c007ea542 100644
--- a/src/Dialogs/FilterEdit.vala
+++ b/src/Dialogs/FilterEdit.vala
@@ -195,7 +195,7 @@ public class Tuba.Dialogs.FilterEdit : Adw.Dialog {
 			this.add_suffix (word_switch);
 			this.activates_default = false;
 
-			var delete_btn = new Gtk.Button.from_icon_name ("user-trash-symbolic") {
+			var delete_btn = new Gtk.Button.from_icon_name ("tuba-user-trash-symbolic") {
 				css_classes = { "circular", "flat", "error" },
 				tooltip_text = _("Delete"),
 				valign = Gtk.Align.CENTER
diff --git a/src/Dialogs/Offline.vala b/src/Dialogs/Offline.vala
index 601ca64bf..f5360e247 100644
--- a/src/Dialogs/Offline.vala
+++ b/src/Dialogs/Offline.vala
@@ -15,7 +15,7 @@ public class Tuba.Dialogs.Offline : Adw.Window {
 
 		this.content = new Gtk.WindowHandle () {
 			child = new Adw.StatusPage () {
-				icon_name = "network-wireless-offline-symbolic",
+				icon_name = "tuba-network-wireless-offline-symbolic",
 				title = _("Offline"),
 				description = _("No Network Connection"),
 				child = exit_btn
diff --git a/src/Dialogs/Preferences.vala b/src/Dialogs/Preferences.vala
index 1fda98cf3..5156029bf 100644
--- a/src/Dialogs/Preferences.vala
+++ b/src/Dialogs/Preferences.vala
@@ -18,7 +18,7 @@ public class Tuba.Dialogs.Preferences : Adw.PreferencesDialog {
 			this.win = win;
 			this.activatable = false;
 
-			var delete_btn = new Gtk.Button.from_icon_name ("user-trash-symbolic") {
+			var delete_btn = new Gtk.Button.from_icon_name ("tuba-user-trash-symbolic") {
 				css_classes = { "circular", "flat", "error" },
 				tooltip_text = _("Delete"),
 				valign = Gtk.Align.CENTER
@@ -26,7 +26,7 @@ public class Tuba.Dialogs.Preferences : Adw.PreferencesDialog {
 			delete_btn.clicked.connect (on_delete);
 			this.add_suffix (delete_btn);
 
-			var edit_btn = new Gtk.Button.from_icon_name ("document-edit-symbolic") {
+			var edit_btn = new Gtk.Button.from_icon_name ("tuba-edit-symbolic") {
 				css_classes = { "circular", "flat" },
 				tooltip_text = _("Edit"),
 				valign = Gtk.Align.CENTER
diff --git a/src/Services/Accounts/InstanceAccount.vala b/src/Services/Accounts/InstanceAccount.vala
index 05d5fca98..c4d98a091 100644
--- a/src/Services/Accounts/InstanceAccount.vala
+++ b/src/Services/Accounts/InstanceAccount.vala
@@ -228,21 +228,21 @@ public class Tuba.InstanceAccount : API.Account, Streamable {
 				break;
 			case KIND_FAVOURITE:
 				result = {
-					"starred-symbolic",
+					"tuba-starred-symbolic",
 					_("%s favorited your post").printf (actor_name),
 					callback_url
 				};
 				break;
 			case KIND_FOLLOW:
 				result = {
-					"contact-new-symbolic",
+					"tuba-contact-new-symbolic",
 					_("%s now follows you").printf (actor_name),
 					callback_url
 				};
 				break;
 			case KIND_FOLLOW_REQUEST:
 				result = {
-					"contact-new-symbolic",
+					"tuba-contact-new-symbolic",
 					_("%s wants to follow you").printf (actor_name),
 					callback_url
 				};
@@ -256,7 +256,7 @@ public class Tuba.InstanceAccount : API.Account, Streamable {
 				break;
 			case KIND_EDITED:
 				result = {
-					"document-edit-symbolic",
+					"tuba-edit-symbolic",
 					_("%s edited a post").printf (actor_name),
 					null
 				};
diff --git a/src/Services/Accounts/Mastodon/Account.vala b/src/Services/Accounts/Mastodon/Account.vala
index f1e8f41b8..b29911a4a 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 = "user-home-symbolic",
+		icon = "tuba-user-home-symbolic",
 		title = _("Home"),
 		needs_attention = false,
 		open_func = win => {
@@ -48,7 +48,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_CONVERSATIONS = new Place () { // vala-lint=naming-convention
 
-		icon = "mail-unread-symbolic",
+		icon = "tuba-mail-unread-symbolic",
 		title = _("Conversations"),
 		open_func = win => {
 			win.go_back_to_start ();
@@ -95,7 +95,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_SEARCH = new Place () { // vala-lint=naming-convention
 
-		icon = "system-search-symbolic",
+		icon = "tuba-edit-find-symbolic",
 		title = _("Search"),
 		open_func = (win) => {
 			win.open_view (set_as_sidebar_item (new Views.Search ()));
@@ -114,7 +114,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 
 	public static Place PLACE_LOCAL = new Place () { // vala-lint=naming-convention
 
-		icon = "network-server-symbolic",
+		icon = "tuba-network-server-symbolic",
 		title = _("Local"),
 		open_func = (win) => {
 			win.open_view (set_as_sidebar_item (new Views.Local ()));
@@ -187,7 +187,7 @@ public class Tuba.Mastodon.Account : InstanceAccount {
 		set_visibility (new Visibility () {
 			id = "direct",
 			name = _("Direct"),
-			icon_name = "mail-unread-symbolic",
+			icon_name = "tuba-mail-unread-symbolic",
 			small_icon_name = "tuba-mail-small-symbolic",
 			description = _("Post to mentioned users only")
 		});
diff --git a/src/Views/Conversations.vala b/src/Views/Conversations.vala
index 60cf030fa..994e11c11 100644
--- a/src/Views/Conversations.vala
+++ b/src/Views/Conversations.vala
@@ -2,7 +2,7 @@ public class Tuba.Views.Conversations : Views.Timeline {
 	construct {
 		url = "/api/v1/conversations";
 		label = _("Conversations");
-		icon = "mail-unread-symbolic";
+		icon = "tuba-mail-unread-symbolic";
 		accepts = typeof (API.Conversation);
 		stream_event[InstanceAccount.EVENT_CONVERSATION].connect (on_new_post);
 		empty_state_title = _("No Conversations");
diff --git a/src/Views/EditHistory.vala b/src/Views/EditHistory.vala
index a7db20ae7..ff3aeced5 100644
--- a/src/Views/EditHistory.vala
+++ b/src/Views/EditHistory.vala
@@ -3,7 +3,7 @@ public class Tuba.Views.EditHistory : Views.Timeline {
 		Object (
 			url: @"/api/v1/statuses/$(status_id)/history",
 			label: _("Edit History"),
-			icon: "document-edit-symbolic",
+			icon: "tuba-edit-symbolic",
 			empty_state_title: _("No Edit History")
 		);
 	}
diff --git a/src/Views/FollowRequests.vala b/src/Views/FollowRequests.vala
index 4bd8f67f4..b2bef2f2e 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 = "address-book-new-symbolic";
+		icon = "tuba-address-book-new-symbolic";
 		accepts = typeof (API.Account);
 		empty_state_title = _("No Follow Requests");
 	}
diff --git a/src/Views/Home.vala b/src/Views/Home.vala
index 756254af4..daac0efec 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 = "user-home-symbolic";
+        icon = "tuba-user-home-symbolic";
         badge_number = 0;
 		needs_attention = false;
 
@@ -17,7 +17,7 @@ public class Tuba.Views.Home : Views.Timeline {
             margin_end = 24,
             reveal_child = true,
             overflow = Gtk.Overflow.VISIBLE,
-            child = new Gtk.Button.from_icon_name ("document-edit-symbolic") {
+            child = new Gtk.Button.from_icon_name ("tuba-edit-symbolic") {
                 action_name = "app.compose",
                 tooltip_text = _("Compose"),
                 css_classes = { "circular", "compose-button", "suggested-action" },
diff --git a/src/Views/Lists.vala b/src/Views/Lists.vala
index a0f38ce1e..d01ac3254 100644
--- a/src/Views/Lists.vala
+++ b/src/Views/Lists.vala
@@ -9,14 +9,14 @@ public class Tuba.Views.Lists : Views.Timeline {
 			var action_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
 
 			edit_button = new Gtk.Button () {
-				icon_name = "document-edit-symbolic",
+				icon_name = "tuba-edit-symbolic",
 				valign = Gtk.Align.CENTER,
 				halign = Gtk.Align.CENTER,
 				css_classes = { "flat", "circular" }
 			};
 
 			delete_button = new Gtk.Button () {
-				icon_name = "user-trash-symbolic",
+				icon_name = "tuba-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 d2afe5479..a2c70bbfa 100644
--- a/src/Views/MediaViewer.vala
+++ b/src/Views/MediaViewer.vala
@@ -291,11 +291,11 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
 		set {
 			if (value) {
 				app.main_window.fullscreen ();
-				fullscreen_btn.icon_name = "view-restore-symbolic";
+				fullscreen_btn.icon_name = "tuba-arrows-pointing-inward-symbolic";
 				_fullscreen = true;
 			} else {
 				app.main_window.unfullscreen ();
-				fullscreen_btn.icon_name = "view-fullscreen-symbolic";
+				fullscreen_btn.icon_name = "tuba-arrows-pointing-outward-symbolic";
 				_fullscreen = false;
 			}
 		}
diff --git a/src/Views/MutesBlocks.vala b/src/Views/MutesBlocks.vala
index 62fa48ac9..bbea10bb6 100644
--- a/src/Views/MutesBlocks.vala
+++ b/src/Views/MutesBlocks.vala
@@ -9,7 +9,7 @@ public class Tuba.Views.MutesBlocks : Views.TabbedBase {
 	public MutesBlocks () {
 		mutes = add_timeline_tab (
 			_("Mutes"),
-			"audio-volume-muted-symbolic",
+			"tuba-audio-volume-muted-symbolic",
 			"/api/v1/mutes",
 			typeof (API.Account),
 			_("No Muted Accounts")
diff --git a/src/Views/Profile.vala b/src/Views/Profile.vala
index 86d39e35e..3a61f4e4c 100644
--- a/src/Views/Profile.vala
+++ b/src/Views/Profile.vala
@@ -143,11 +143,11 @@ public class Tuba.Views.Profile : Views.Accounts {
 		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 = "view-more-symbolic";
+		menu_button.icon_name = "tuba-view-more-symbolic";
 		header.pack_end (menu_button);
 
 		if (profile.account.is_self ()) {
-			var edit_btn = new Gtk.Button.from_icon_name ("document-edit-symbolic") {
+			var edit_btn = new Gtk.Button.from_icon_name ("tuba-edit-symbolic") {
 				tooltip_text = _("Edit Profile")
 			};
 			edit_btn.clicked.connect (open_edit_page);
@@ -384,7 +384,7 @@ public class Tuba.Views.Profile : Views.Accounts {
 		};
 
 		var no_lists_page = new Adw.StatusPage () {
-			icon_name = "dialog-error-symbolic",
+			icon_name = "tuba-minus-circle-filled-symbolic",
 			vexpand = true,
 			title = _("You don't have any lists")
 		};
diff --git a/src/Views/StatusStats.vala b/src/Views/StatusStats.vala
index 25c79cd7f..771588532 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"),
-			"starred-symbolic",
+			"tuba-starred-symbolic",
 			@"/api/v1/statuses/$(status_id)/favourited_by",
 			typeof (API.Account),
 			_("No Favorites")
diff --git a/src/Widgets/Attachment/Image.vala b/src/Widgets/Attachment/Image.vala
index 2a9b5c14c..319aad5bb 100644
--- a/src/Widgets/Attachment/Image.vala
+++ b/src/Widgets/Attachment/Image.vala
@@ -61,7 +61,7 @@ public class Tuba.Widgets.Attachment.Image : Widgets.Attachment.Item {
 
 			if (media_kind != Tuba.Attachment.MediaType.AUDIO) {
 				media_icon.css_classes = { "osd", "circular", "attachment-overlay-icon" };
-				media_icon.icon_name = "media-playback-start-symbolic";
+				media_icon.icon_name = "tuba-play-large-symbolic";
 			} else {
 				pic_paintable_id = pic.notify["paintable"].connect (on_audio_paintable_notify);
 				media_icon.icon_name = "tuba-music-note-symbolic";
diff --git a/src/Widgets/PreviewCard.vala b/src/Widgets/PreviewCard.vala
index 4aced5266..89c793aec 100644
--- a/src/Widgets/PreviewCard.vala
+++ b/src/Widgets/PreviewCard.vala
@@ -43,7 +43,7 @@ public class Tuba.Widgets.PreviewCard : Gtk.Button {
 					valign = Gtk.Align.CENTER,
 					halign = Gtk.Align.CENTER,
 					css_classes = {"osd", "circular", "attachment-overlay-icon"},
-					icon_name = "media-playback-start-symbolic",
+					icon_name = "tuba-play-large-symbolic",
 					icon_size = Gtk.IconSize.LARGE
 				});
 
@@ -56,7 +56,7 @@ public class Tuba.Widgets.PreviewCard : Gtk.Button {
 			}
 		} else {
 			image_widget = new Gtk.Image.from_icon_name (
-				is_video ? "media-playback-start-symbolic" : "tuba-earth-symbolic"
+				is_video ? "tuba-play-large-symbolic" : "tuba-earth-symbolic"
 			) {
 				height_request = 70,
 				width_request = 70,
diff --git a/src/Widgets/ProfileCover.vala b/src/Widgets/ProfileCover.vala
index 23b211041..7768947c2 100644
--- a/src/Widgets/ProfileCover.vala
+++ b/src/Widgets/ProfileCover.vala
@@ -192,7 +192,7 @@ protected class Tuba.Widgets.Cover : Gtk.Box {
                 title_box.append (new Gtk.Label (_("Joined")) {
                     css_classes = {"dim-label"}
                 });
-                title_box.prepend (new Gtk.Image.from_icon_name ("contact-new-symbolic"));
+                title_box.prepend (new Gtk.Image.from_icon_name ("tuba-contact-new-symbolic"));
                 row.append (title_box);
                 row.append (val);
 
diff --git a/src/Widgets/Status/ActionsRow.vala b/src/Widgets/Status/ActionsRow.vala
index afeff04a7..362953bca 100644
--- a/src/Widgets/Status/ActionsRow.vala
+++ b/src/Widgets/Status/ActionsRow.vala
@@ -95,7 +95,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 = "starred-symbolic",
+			active_icon_name = "tuba-starred-symbolic",
 			css_classes = { "ttl-status-action-star", "flat", "circular" },
 			halign = Gtk.Align.START,
 			hexpand = true,