diff --git a/CHANGELOG.md b/CHANGELOG.md
index affcdc85..3f862185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.2.2]
+### Improvements
+- Adding tooltips to toolbar buttons
+- "Update ?" column renamed to "Upgrade ?"
+
 ## [0.2.1] - 2019-06-24
 ### Features
 - Showing the number of apps and runtime updates available
diff --git a/fpakman/resources/locale/en b/fpakman/resources/locale/en
index 6a3a38ff..15424852 100644
--- a/fpakman/resources/locale/en
+++ b/fpakman/resources/locale/en
@@ -5,11 +5,13 @@ manage_window.columns.branch=Branch
 manage_window.columns.arch=Arch
 manage_window.columns.ref=Ref
 manage_window.columns.origin=Origin
-manage_window.columns.update=Update ?
+manage_window.columns.update=Upgrade ?
 manage_window.checkbox.only_apps=Apps
 manage_window.label.updates=Updates
 manage_window.status.refreshing=Refreshing
 manage_window.status.updating=Updating
+manage_window.bt.refresh.tooltip=Reload the data about installed applications
+manage_window.bt.upgrade.tooltip=Upgrade all selected applications
 popup.flatpak_not_installed.title=Error
 popup.flatpak_not_installed.msg=flatpak seems not to be installed. Exiting
 tray.action.manage=Manage applications
diff --git a/fpakman/resources/locale/es b/fpakman/resources/locale/es
index 801c5b26..9c8f43d4 100644
--- a/fpakman/resources/locale/es
+++ b/fpakman/resources/locale/es
@@ -10,6 +10,8 @@ manage_window.checkbox.only_apps=Apps
 manage_window.label.updates=Actualizaciones
 manage_window.status.refreshing=Recargando
 manage_window.status.updating=Actualizando
+manage_window.bt.refresh.tooltip=Recarga los datos sobre los aplicativos instalados
+manage_window.bt.upgrade.tooltip=Actualiza todos los aplicativos seleccionados
 popup.flatpak_not_installed.title=Error
 popup.flatpak_not_installed.msg=flatpak no parece estar instalado. Saliendo
 tray.action.manage=Administrar aplicativos
diff --git a/fpakman/resources/locale/pt b/fpakman/resources/locale/pt
index 61db2c38..957ff0ef 100644
--- a/fpakman/resources/locale/pt
+++ b/fpakman/resources/locale/pt
@@ -10,6 +10,8 @@ manage_window.checkbox.only_apps=Apps
 manage_window.label.updates=Atualizações
 manage_window.status.refreshing=Recarregando
 manage_window.status.updating=Atualizando
+manage_window.bt.refresh.tooltip=Recarrega os dados sobre os aplicativos instalados
+manage_window.bt.upgrade.tooltip=Atualiza todos os aplicativos selecionados
 popup.flatpak_not_installed.title=Erro
 popup.flatpak_not_installed.msg=flatpak não parece estar instalado. Saindo
 tray.action.manage=Gerenciar aplicativos
diff --git a/fpakman/view/qt/window.py b/fpakman/view/qt/window.py
index ab5bb616..1be598c8 100755
--- a/fpakman/view/qt/window.py
+++ b/fpakman/view/qt/window.py
@@ -94,15 +94,17 @@ class ManageWindow(QWidget):
         toolbar.addWidget(spacer)
 
         self.bt_refresh = QToolButton()
+        self.bt_refresh.setToolTip(locale_keys['manage_window.bt.refresh.tooltip'])
         self.bt_refresh.setIcon(QIcon(resource.get_path('img/refresh.svg')))
         self.bt_refresh.clicked.connect(lambda: self.refresh(clear_output=True))
         toolbar.addWidget(self.bt_refresh)
 
-        self.bt_update = QToolButton()
-        self.bt_update.setIcon(QIcon(resource.get_path('img/update_green.svg')))
-        self.bt_update.setEnabled(False)
-        self.bt_update.clicked.connect(self.update_selected)
-        toolbar.addWidget(self.bt_update)
+        self.bt_upgrade = QToolButton()
+        self.bt_upgrade.setToolTip(locale_keys['manage_window.bt.upgrade.tooltip'])
+        self.bt_upgrade.setIcon(QIcon(resource.get_path('img/update_green.svg')))
+        self.bt_upgrade.setEnabled(False)
+        self.bt_upgrade.clicked.connect(self.update_selected)
+        toolbar.addWidget(self.bt_upgrade)
 
         self.layout.addWidget(toolbar)
 
@@ -268,7 +270,7 @@ class ManageWindow(QWidget):
                 enable_bt_update = True
                 break
 
-        self.bt_update.setEnabled(enable_bt_update)
+        self.bt_upgrade.setEnabled(enable_bt_update)
 
         self.tray_icon.notify_updates(total_updates)
 
@@ -383,7 +385,7 @@ class ManageWindow(QWidget):
 
     def _begin_action(self, action_label: str):
         self.label_status.setText(action_label)
-        self.bt_update.setEnabled(False)
+        self.bt_upgrade.setEnabled(False)
         self.bt_refresh.setEnabled(False)
         self.checkbox_only_apps.setEnabled(False)
         self.table_apps.setEnabled(False)