diff --git a/po/POTFILES.in b/po/POTFILES.in
index 505cc02d..9982d5a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,9 +5,11 @@ data/org.gnome.Fractal.gschema.xml.in
 data/org.gnome.Fractal.metainfo.xml.in.in
 
 src/account_switcher/mod.ui
+src/account_switcher/session_item.ui
 src/application.rs
 src/components/auth_dialog.ui
 src/components/editable_avatar.rs
+src/components/editable_avatar.ui
 src/components/loading_row.ui
 src/components/location_viewer.rs
 src/components/media_content_viewer.rs
@@ -52,20 +54,24 @@ src/session/view/account_settings/user_page/mod.ui
 src/session/view/content/explore/mod.ui
 src/session/view/content/explore/public_room_row.rs
 src/session/view/content/explore/servers_popover.ui
+src/session/view/content/explore/server_row.ui
 src/session/view/content/invite.rs
 src/session/view/content/invite.ui
 src/session/view/content/mod.ui
 src/session/view/content/room_details/general_page/mod.rs
 src/session/view/content/room_details/general_page/mod.ui
 src/session/view/content/room_details/history_viewer/audio_row.rs
+src/session/view/content/room_details/history_viewer/audio_row.ui
 src/session/view/content/room_details/history_viewer/audio.ui
 src/session/view/content/room_details/history_viewer/file_row.rs
+src/session/view/content/room_details/history_viewer/file_row.ui
 src/session/view/content/room_details/history_viewer/file.ui
 src/session/view/content/room_details/history_viewer/media.ui
 src/session/view/content/room_details/invite_subpage/invitee_list.rs
 src/session/view/content/room_details/invite_subpage/mod.rs
 src/session/view/content/room_details/invite_subpage/mod.ui
 src/session/view/content/room_details/member_page/members_list_view/extra_lists.rs
+src/session/view/content/room_details/member_page/members_list_view/member_row.ui
 src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.rs
 src/session/view/content/room_details/member_page/member_menu.ui
 src/session/view/content/room_details/member_page/mod.rs
diff --git a/src/account_switcher/session_item.ui b/src/account_switcher/session_item.ui
index d5e085e2..aa9bca51 100644
--- a/src/account_switcher/session_item.ui
+++ b/src/account_switcher/session_item.ui
@@ -61,6 +61,10 @@
             <property name="icon-name">applications-system-symbolic</property>
             <property name="valign">center</property>
             <property name="halign">center</property>
+            <property name="tooltip-text" translatable="yes">Account Settings</property>
+            <accessibility>
+              <property name="label" translatable="yes">Account Settings</property>
+            </accessibility>
             <signal name="clicked" handler="show_account_settings" swapped="true"/>
             <style>
               <class name="circular"/>
diff --git a/src/components/editable_avatar.ui b/src/components/editable_avatar.ui
index 13509f04..acfaa19e 100644
--- a/src/components/editable_avatar.ui
+++ b/src/components/editable_avatar.ui
@@ -50,6 +50,10 @@
               <object class="ComponentsActionButton" id="button_remove">
                 <property name="icon-name">user-trash-symbolic</property>
                 <property name="action-name">editable-avatar.remove-avatar</property>
+                <property name="tooltip-text" translatable="yes">Remove Avatar</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Remove Avatar</property>
+                </accessibility>
               </object>
             </child>
           </object>
@@ -66,6 +70,10 @@
               <object class="ComponentsActionButton" id="button_edit">
                 <property name="icon-name">document-edit-symbolic</property>
                 <property name="action-name">editable-avatar.edit-avatar</property>
+                <property name="tooltip-text" translatable="yes">Select New Avatar</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Select New Avatar</property>
+                </accessibility>
               </object>
             </child>
           </object>
diff --git a/src/greeter.ui b/src/greeter.ui
index be46934e..ff76c960 100644
--- a/src/greeter.ui
+++ b/src/greeter.ui
@@ -10,6 +10,10 @@
                 <property name="action-name">app.show-session</property>
                 <property name="visible" bind-source="back_button" bind-property="sensitive" bind-flags="sync-create"/>
                 <property name="icon-name">go-previous-symbolic</property>
+                <property name="tooltip-text" translatable="yes">Back</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Back</property>
+                </accessibility>
               </object>
             </child>
             <child type="start">
@@ -18,6 +22,9 @@
                 <property name="action-name">app.about</property>
                 <property name="tooltip-text" translatable="yes">About Fractal</property>
                 <property name="icon-name">help-about-symbolic</property>
+                <accessibility>
+                  <property name="label" translatable="yes">About Fractal</property>
+                </accessibility>
               </object>
             </child>
             <child type="end">
@@ -26,6 +33,9 @@
                 <property name="action-name">app.about</property>
                 <property name="tooltip-text" translatable="yes">About Fractal</property>
                 <property name="icon-name">help-about-symbolic</property>
+                <accessibility>
+                  <property name="label" translatable="yes">About Fractal</property>
+                </accessibility>
               </object>
             </child>
           </object>
diff --git a/src/login/mod.ui b/src/login/mod.ui
index a336b65e..ed3bcb2a 100644
--- a/src/login/mod.ui
+++ b/src/login/mod.ui
@@ -10,6 +10,10 @@
               <object class="GtkButton" id="back_button">
                 <property name="icon-name">go-previous-symbolic</property>
                 <signal name="clicked" handler="go_previous" swapped="yes"/>
+                <property name="tooltip-text" translatable="yes">Back</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Back</property>
+                </accessibility>
               </object>
             </child>
             <style>
diff --git a/src/session/view/account_settings/devices_page/device_row.ui b/src/session/view/account_settings/devices_page/device_row.ui
index f7b77065..606a750e 100644
--- a/src/session/view/account_settings/devices_page/device_row.ui
+++ b/src/session/view/account_settings/devices_page/device_row.ui
@@ -26,6 +26,12 @@
             <child>
               <object class="GtkImage" id="verified_icon">
                 <property name="icon-name">verified-symbolic</property>
+                <!-- Translators: As in 'A verified session'. -->
+                <property name="tooltip-text" translatable="yes">Verified</property>
+                <accessibility>
+                  <!-- Translators: As in 'A verified session'. -->
+                  <property name="label" translatable="yes">Verified</property>
+                </accessibility>
               </object>
             </child>
           </object>
diff --git a/src/session/view/content/explore/mod.ui b/src/session/view/content/explore/mod.ui
index 1974ce0a..a7815bd4 100644
--- a/src/session/view/content/explore/mod.ui
+++ b/src/session/view/content/explore/mod.ui
@@ -24,7 +24,6 @@
               <object class="GtkMenuButton" id="servers_button">
                 <property name="valign">center</property>
                 <property name="direction">down</property>
-                <property name="icon-name">format-justify-left-symbolic</property>
                 <property name="popover">
                   <object class="ContentExploreServersPopover" id="servers_popover">
                     <property name="session" bind-source="ContentExplore" bind-property="session" bind-flags="sync-create"/>
diff --git a/src/session/view/content/explore/server_row.ui b/src/session/view/content/explore/server_row.ui
index e9fd987c..c68dfe4e 100644
--- a/src/session/view/content/explore/server_row.ui
+++ b/src/session/view/content/explore/server_row.ui
@@ -25,6 +25,10 @@
             <property name="icon-name">window-close-symbolic</property>
             <property name="valign">center</property>
             <property name="halign">center</property>
+            <property name="tooltip-text" translatable="yes">Remove Server</property>
+            <accessibility>
+              <property name="label" translatable="yes">Remove Server</property>
+            </accessibility>
             <style>
               <class name="circular"/>
               <class name="flat"/>
diff --git a/src/session/view/content/explore/servers_popover.ui b/src/session/view/content/explore/servers_popover.ui
index cdaa5779..64f4c741 100644
--- a/src/session/view/content/explore/servers_popover.ui
+++ b/src/session/view/content/explore/servers_popover.ui
@@ -39,6 +39,10 @@
                   <object class="GtkButton">
                     <property name="icon-name">list-add-symbolic</property>
                     <property name="action-name">explore-servers-popover.add-server</property>
+                    <property name="tooltip-text" translatable="yes">Add Server</property>
+                    <accessibility>
+                      <property name="label" translatable="yes">Add Server</property>
+                    </accessibility>
                   </object>
                 </child>
               </object>
diff --git a/src/session/view/content/room_details/history_viewer/audio_row.ui b/src/session/view/content/room_details/history_viewer/audio_row.ui
index 0d09beee..2db556f5 100644
--- a/src/session/view/content/room_details/history_viewer/audio_row.ui
+++ b/src/session/view/content/room_details/history_viewer/audio_row.ui
@@ -9,6 +9,12 @@
             <property name="action-name">audio-row.toggle-play</property>
             <property name="icon-name">media-playback-start-symbolic</property>
             <property name="valign">center</property>
+            <!-- Translators: As in "Play audio file". -->
+            <property name="tooltip-text" translatable="yes">Play</property>
+            <accessibility>
+              <!-- Translators: As in "Play audio file". -->
+              <property name="label" translatable="yes">Play</property>
+            </accessibility>
             <style>
               <class name="circular"/>
               <class name="suggested-action"/>
diff --git a/src/session/view/content/room_details/history_viewer/file_row.ui b/src/session/view/content/room_details/history_viewer/file_row.ui
index 59e2ccb7..14c59372 100644
--- a/src/session/view/content/room_details/history_viewer/file_row.ui
+++ b/src/session/view/content/room_details/history_viewer/file_row.ui
@@ -9,6 +9,10 @@
             <property name="action-name">file-row.save-file</property>
             <property name="icon-name">folder-download-symbolic</property>
             <property name="valign">center</property>
+            <property name="tooltip-text" translatable="yes">Save File</property>
+            <accessibility>
+              <property name="label" translatable="yes">Save File</property>
+            </accessibility>
             <style>
               <class name="circular"/>
               <class name="suggested-action"/>
diff --git a/src/session/view/content/room_details/member_page/members_list_view/member_row.ui b/src/session/view/content/room_details/member_page/members_list_view/member_row.ui
index 54f0891f..d9e75d60 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/member_row.ui
+++ b/src/session/view/content/room_details/member_page/members_list_view/member_row.ui
@@ -46,6 +46,12 @@
                 <child>
                   <object class="GtkImage" id="verified_icon">
                     <property name="icon-name">verified-symbolic</property>
+                    <!-- Translators: As in "Verified room member". -->
+                    <property name="tooltip-text" translatable="yes">Verified</property>
+                    <accessibility>
+                      <!-- Translators: As in "Verified room member". -->
+                      <property name="label" translatable="yes">Verified</property>
+                    </accessibility>
                     <binding name="visible">
                       <lookup name="verified" type="User">
                         <lookup name="member">ContentMemberRow</lookup>
@@ -85,6 +91,10 @@
           <object class="GtkToggleButton" id="menu_btn">
             <property name="has-frame">False</property>
             <property name="icon-name">view-more-symbolic</property>
+            <property name="tooltip-text" translatable="yes">Member Menu</property>
+            <accessibility>
+              <property name="label" translatable="yes">Member Menu</property>
+            </accessibility>
           </object>
         </child>
       </object>
diff --git a/src/session/view/content/room_details/member_page/mod.ui b/src/session/view/content/room_details/member_page/mod.ui
index d6e06cd6..11c03eec 100644
--- a/src/session/view/content/room_details/member_page/mod.ui
+++ b/src/session/view/content/room_details/member_page/mod.ui
@@ -9,8 +9,9 @@
             <child type="end">
               <object class="GtkToggleButton" id="search_button">
                 <property name="icon-name">system-search-symbolic</property>
+                <property name="tooltip-text" translatable="yes">Toggle Room Members Search</property>
                 <accessibility>
-                  <property name="label" translatable="yes">Search for Room Members</property>
+                  <property name="label" translatable="yes">Toggle Room Members Search</property>
                 </accessibility>
               </object>
             </child>
diff --git a/src/session/view/content/room_history/message_row/file.ui b/src/session/view/content/room_history/message_row/file.ui
index 1a79d6b6..c5e56d3e 100644
--- a/src/session/view/content/room_history/message_row/file.ui
+++ b/src/session/view/content/room_history/message_row/file.ui
@@ -22,7 +22,10 @@
           <object class="GtkButton" id="save">
             <property name="visible" bind-source="ContentMessageFile" bind-property="compact" bind-flags="sync-create | invert-boolean"/>
             <property name="icon-name">document-save-symbolic</property>
-            <property name="tooltip-text" translatable="yes">Save</property>
+            <property name="tooltip-text" translatable="yes">Save File</property>
+            <accessibility>
+              <property name="label" translatable="yes">Save File</property>
+            </accessibility>
             <property name="action-name">event.file-save</property>
           </object>
         </child>
diff --git a/src/session/view/content/room_history/message_row/mod.ui b/src/session/view/content/room_history/message_row/mod.ui
index f54b6548..0808293a 100644
--- a/src/session/view/content/room_history/message_row/mod.ui
+++ b/src/session/view/content/room_history/message_row/mod.ui
@@ -66,7 +66,12 @@
               <class name="dim-label"/>
             </style>
             <property name="icon-name">document-edit-symbolic</property>
+            <!-- Translators: As in 'Edited message'. -->
             <property name="tooltip-text" translatable="yes">Edited</property>
+            <accessibility>
+              <!-- Translators: As in 'Edited message'. -->
+              <property name="label" translatable="yes">Edited</property>
+            </accessibility>
             <binding name="visible">
               <lookup name="is-edited" type="RoomEvent">
                 <lookup name="event">ContentMessageRow</lookup>
diff --git a/src/session/view/content/room_history/message_toolbar/mod.ui b/src/session/view/content/room_history/message_toolbar/mod.ui
index fe4c1aa2..bc60e8db 100644
--- a/src/session/view/content/room_history/message_toolbar/mod.ui
+++ b/src/session/view/content/room_history/message_toolbar/mod.ui
@@ -67,6 +67,9 @@
             <property name="icon-name">window-close-symbolic</property>
             <property name="action-name">message-toolbar.clear-related-event</property>
             <property name="tooltip-text" translatable="yes">Cancel</property>
+            <accessibility>
+              <property name="label" translatable="yes">Cancel</property>
+            </accessibility>
           </object>
         </child>
       </object>
@@ -81,8 +84,9 @@
             <property name="valign">end</property>
             <property name="icon-name">mail-attachment-symbolic</property>
             <property name="action-name">message-toolbar.select-file</property>
+            <property name="tooltip-text" translatable="yes">Send a File</property>
             <accessibility>
-              <property name="label" translatable="yes">Browse Attachment</property>
+              <property name="label" translatable="yes">Send a File</property>
             </accessibility>
           </object>
         </child>
@@ -91,8 +95,9 @@
             <property name="valign">end</property>
             <property name="icon-name">emoji-people-symbolic</property>
             <property name="action-name">message-toolbar.open-emoji</property>
+            <property name="tooltip-text" translatable="yes">Insert an Emoji</property>
             <accessibility>
-              <property name="label" translatable="yes">Open Emoji Picker</property>
+              <property name="label" translatable="yes">Insert an Emoji</property>
             </accessibility>
           </object>
         </child>
@@ -129,8 +134,9 @@
             <property name="direction">up</property>
             <property name="icon-name">view-more-horizontal-symbolic</property>
             <property name="menu-model">message-menu-model</property>
+            <property name="tooltip-text" translatable="yes">More Options</property>
             <accessibility>
-              <property name="label" translatable="yes">Open Message Menu</property>
+              <property name="label" translatable="yes">More Options</property>
             </accessibility>
           </object>
         </child>
@@ -140,6 +146,7 @@
             <property name="icon-name">send-symbolic</property>
             <property name="focus-on-click">False</property>
             <property name="action-name">message-toolbar.send-text-message</property>
+            <property name="tooltip-text" translatable="yes">Send Message</property>
             <style>
               <class name="suggested-action"/>
               <class name="circular"/>
diff --git a/src/session/view/content/room_history/mod.ui b/src/session/view/content/room_history/mod.ui
index d512448b..ba4901df 100644
--- a/src/session/view/content/room_history/mod.ui
+++ b/src/session/view/content/room_history/mod.ui
@@ -53,8 +53,9 @@
               <object class="GtkMenuButton" id="room_menu">
                 <property name="icon-name">view-more-symbolic</property>
                 <property name="menu-model">room-menu-model</property>
+                <property name="tooltip-text" translatable="yes">Room Menu</property>
                 <accessibility>
-                  <property name="label" translatable="yes">Room Settings</property>
+                  <property name="label" translatable="yes">Room Menu</property>
                 </accessibility>
               </object>
             </child>
@@ -125,6 +126,7 @@
                           <object class="GtkButton" id="scroll_btn">
                             <property name="icon-name">go-bottom-symbolic</property>
                             <property name="action-name">room-history.scroll-down</property>
+                            <property name="tooltip-text" translatable="yes">Scroll to Bottom</property>
                             <accessibility>
                               <property name="label" translatable="yes">Scroll to bottom</property>
                             </accessibility>
diff --git a/src/session/view/event_source_dialog.ui b/src/session/view/event_source_dialog.ui
index bc0dc957..5e4d789c 100644
--- a/src/session/view/event_source_dialog.ui
+++ b/src/session/view/event_source_dialog.ui
@@ -15,6 +15,10 @@
                 <property name="icon-name">edit-copy-symbolic</property>
                 <property name="focus-on-click">False</property>
                 <property name="action-name">event-source-dialog.copy</property>
+                <property name="tooltip-text" translatable="yes">Copy to Clipboard</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Copy to Clipboard</property>
+                </accessibility>
               </object>
             </child>
           </object>
diff --git a/src/session/view/media_viewer.ui b/src/session/view/media_viewer.ui
index d46e187d..a3e0922d 100644
--- a/src/session/view/media_viewer.ui
+++ b/src/session/view/media_viewer.ui
@@ -53,12 +53,20 @@
               <object class="GtkButton" id="back">
                 <property name="icon-name">go-previous-symbolic</property>
                 <property name="action-name">media-viewer.close</property>
+                <property name="tooltip-text" translatable="yes">Back</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Back</property>
+                </accessibility>
               </object>
             </child>
             <child type="end">
               <object class="GtkMenuButton" id="menu">
                 <property name="icon-name">view-more-symbolic</property>
                 <property name="menu-model">media-menu-model</property>
+                <property name="tooltip-text" translatable="yes">Media Menu</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Media Menu</property>
+                </accessibility>
               </object>
             </child>
             <child type="end">
@@ -66,6 +74,10 @@
                 <property name="visible" bind-source="MediaViewer" bind-property="fullscreened" bind-flags="sync-create|invert-boolean"/>
                 <property name="icon-name">view-fullscreen-symbolic</property>
                 <property name="action-name">win.toggle-fullscreen</property>
+                <property name="tooltip-text" translatable="yes">Fullscreen</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Fullscreen</property>
+                </accessibility>
               </object>
             </child>
             <child type="end">
@@ -73,6 +85,10 @@
                 <property name="visible" bind-source="MediaViewer" bind-property="fullscreened" bind-flags="sync-create"/>
                 <property name="icon-name">view-restore-symbolic</property>
                 <property name="action-name">win.toggle-fullscreen</property>
+                <property name="tooltip-text" translatable="yes">Exit Fullscreen</property>
+                <accessibility>
+                  <property name="label" translatable="yes">Exit Fullscreen</property>
+                </accessibility>
               </object>
             </child>
           </object>
diff --git a/src/session/view/sidebar/entry_row.ui b/src/session/view/sidebar/entry_row.ui
index a3161f99..87cbecf5 100644
--- a/src/session/view/sidebar/entry_row.ui
+++ b/src/session/view/sidebar/entry_row.ui
@@ -6,7 +6,6 @@
         <property name="spacing">12</property>
         <child>
           <object class="GtkImage">
-            <property name="icon-name">explore2-symbolic</property>
             <binding name="icon-name">
               <lookup name="icon-name" type="Entry">
                 <lookup name="entry">SidebarEntryRow</lookup>
diff --git a/src/session/view/sidebar/mod.ui b/src/session/view/sidebar/mod.ui
index 7ef7807e..f3392912 100644
--- a/src/session/view/sidebar/mod.ui
+++ b/src/session/view/sidebar/mod.ui
@@ -88,6 +88,7 @@
             <property name="show-title">False</property>
             <child type="start">
               <object class="GtkMenuButton" id="account_switcher_button">
+                <property name="tooltip-text" translatable="yes">Switch Accounts</property>
                 <accessibility>
                   <property name="label" translatable="yes">Switch Accounts</property>
                 </accessibility>
@@ -110,8 +111,9 @@
               <object class="GtkMenuButton" id="appmenu_button">
                 <property name="icon-name">open-menu-symbolic</property>
                 <property name="menu-model">primary_menu</property>
+                <property name="tooltip-text" translatable="yes">Main Menu</property>
                 <accessibility>
-                  <property name="label" translatable="yes">App Settings Menu</property>
+                  <property name="label" translatable="yes">Main Menu</property>
                 </accessibility>
               </object>
             </child>
@@ -120,6 +122,7 @@
                 <property name="icon-name">system-search-symbolic</property>
                 <property name="active" bind-source="room_search" bind-property="search-mode-enabled" bind-flags="sync-create"/>
                 <property name="action-name">session.toggle-room-search</property>
+                <property name="tooltip-text" translatable="yes">Toggle Room Search</property>
                 <accessibility>
                   <property name="label" translatable="yes">Toggle Room Search</property>
                 </accessibility>