diff --git a/branding/Makefile.in b/branding/Makefile.in
index 9bd0ae0..a157e90 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -138,6 +138,12 @@ install-linux: \
 		mime.xml \
 		$(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml
 
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/metainfo
+
+	@$(INSTALL_DATA) \
+		appdata.xml \
+		$(DESTDIR)$(datarootdir)/metainfo/$(PRODUCT_NAME).appdata.xml
+
 install-windows: \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.png \
diff --git a/branding/appdata.xml.in b/branding/appdata.xml.in
new file mode 100644
index 0000000..3ec8fca
--- /dev/null
+++ b/branding/appdata.xml.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>@PRODUCT_NAME@</id>
+	<metadata_license>LGPL-3.0</metadata_license>
+	<project_license>LGPL-3.0</project_license>
+	<name>@PRODUCT_NAME@</name>
+	<summary>IBM 3270 Terminal emulator for GTK</summary>
+	<description>
+		<p>GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
+</p>
+	</description>
+	<launchable type="desktop-id">@PRODUCT_NAME@.desktop</launchable>
+	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270-logo.svg</image>
+		</screenshot>
+	</screenshots>
+	<provides>
+		<id>@PRODUCT_NAME@pw32.desktop</id>
+	</provides>
+</component>
diff --git a/configure.ac b/configure.ac
index 28312ab..74a2710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,7 @@ AC_CONFIG_FILES(locale/Makefile)
 AC_CONFIG_FILES(branding/Makefile)
 AC_CONFIG_FILES(branding/launcher.desktop)
 AC_CONFIG_FILES(branding/mime.xml)
+AC_CONFIG_FILES(branding/appdata.xml)
 
 dnl ---------------------------------------------------------------------------
 dnl Output the generated config.status script.
diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c
index 568bf69..42de61b 100644
--- a/src/objects/toolbar/settings.c
+++ b/src/objects/toolbar/settings.c
@@ -70,12 +70,12 @@
 	gtk_widget_set_sensitive(button,gtk_tree_selection_count_selected_rows(selection) > 0);
  }
 
- void toolbar_insert(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
+ static void toolbar_insert(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
  	debug("%s(%p)",__FUNCTION__,settings);
  	pw3270_action_view_move_selected(settings->views[1],settings->views[0]);
  }
 
- void toolbar_remove(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
+ static void toolbar_remove(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
  	debug("%s(%p)",__FUNCTION__,settings);
  	pw3270_action_view_move_selected(settings->views[0],settings->views[1]);
  }
@@ -322,48 +322,3 @@
 
  }
 
- /*
-
- typedef struct _ToolbarSettingsPage {
-	Pw3270SettingsPage parent;
-	GtkWidget * views[2];
-	GtkWidget * buttons[2];
-	GtkTreeModel * models[2];
-	GtkWidget * combos[G_N_ELEMENTS(comboboxes)];
-
- } ToolbarSettingsPage;
-
- static void load(Pw3270SettingsPage *pg, GtkApplication *application) {
-
- 	size_t ix;
-	ToolbarSettingsPage * page = (ToolbarSettingsPage *) pg;
-	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
-
- 	debug("%s",__FUNCTION__);
-
-
- }
-
- static void apply(Pw3270SettingsPage *pg, GtkApplication G_GNUC_UNUSED(*application)) {
-
- }
-
-
- Pw3270SettingsPage * pw3270_toolbar_settings_new() {
-
-	size_t ix;
-
-	ToolbarSettingsPage * page = g_new0(ToolbarSettingsPage,1);
-
-	page->parent.load = load;
-	page->parent.apply = apply;
-	page->parent.label = _("Toolbar");
-	page->parent.title = _("Setup toolbar");
-
-	page->parent.widget = gtk_box_new(GTK_ORIENTATION_VERTICAL,0);
-
-
-
-	return (Pw3270SettingsPage *) page;
- }
- */
--
libgit2 0.21.2