diff --git a/Makefile.in b/Makefile.in
index c02617e..2cde72c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -270,7 +270,8 @@ install-application: \
 	$(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
 	install-locale \
 	install-schemas \
-	install-branding
+	install-branding \
+	install-icons
 
 	@$(MKDIR) \
 		$(DESTDIR)/$(bindir)
@@ -302,6 +303,15 @@ install-keypads:
 		keypad/*.xml \
 		$(DESTDIR)/$(datarootdir)/$(PRODUCT_NAME)/keypad
 
+install-icons:
+
+	@$(MKDIR) \
+		$(DESTDIR)/$(datarootdir)/$(PRODUCT_NAME)/icons
+
+	@$(INSTALL_DATA) \
+		icons/*.svg \
+		$(DESTDIR)/$(datarootdir)/$(PRODUCT_NAME)/icons
+
 #---[ Misc Targets ]---------------------------------------------------------------------
 
 locale/$(PACKAGE_NAME).pot: \
diff --git a/icons/gtk-connect-symbolic.svg b/icons/gtk-connect-symbolic.svg
new file mode 100644
index 0000000..9b71d16
--- /dev/null
+++ b/icons/gtk-connect-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-lan-connect" width="24" height="24" viewBox="0 0 24 24"><path d="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,13V18L3,20H10V18H5V13H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M14,15H20V19H14V15Z" /></svg>
\ No newline at end of file
diff --git a/icons/gtk-disconnect-symbolic.svg b/icons/gtk-disconnect-symbolic.svg
new file mode 100644
index 0000000..51923e1
--- /dev/null
+++ b/icons/gtk-disconnect-symbolic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12,16 L12,14.5 C12,13.6715729 12.6715729,13 13.5,13 L19.5,13 C20.3284271,13 21,13.6715729 21,14.5 L21,18.5 C21,19.3284271 20.3284271,20 19.5,20 L18.5,20 C18.7761424,20 19,20.2238576 19,20.5 C19,20.7761424 18.7761424,21 18.5,21 L14.5,21 C14.2238576,21 14,20.7761424 14,20.5 C14,20.2238576 14.2238576,20 14.5,20 L13.5,20 C12.6715729,20 12,19.3284271 12,18.5 L12,17 L10.5,17 C10.2238576,17 10,16.7761424 10,16.5 C10,16.2238576 10.2238576,16 10.5,16 L12,16 Z M7,11 L5.5,11 C5.22385763,11 5,10.7761424 5,10.5 C5,10.2238576 5.22385763,10 5.5,10 L4.5,10 C3.67157288,10 3,9.32842712 3,8.5 L3,4.5 C3,3.67157288 3.67157288,3 4.5,3 L10.5,3 C11.3284271,3 12,3.67157288 12,4.5 L12,8.5 C12,9.32842712 11.3284271,10 10.5,10 L9.5,10 C9.77614237,10 10,10.2238576 10,10.5 C10,10.7761424 9.77614237,11 9.5,11 L8,11 L8,13.5 C8,13.7761424 7.77614237,14 7.5,14 C7.22385763,14 7,13.7761424 7,13.5 L7,11 Z M7.5,15.7928932 L9.14644661,14.1464466 C9.34170876,13.9511845 9.65829124,13.9511845 9.85355339,14.1464466 C10.0488155,14.3417088 10.0488155,14.6582912 9.85355339,14.8535534 L8.20710678,16.5 L9.85355339,18.1464466 C10.0488155,18.3417088 10.0488155,18.6582912 9.85355339,18.8535534 C9.65829124,19.0488155 9.34170876,19.0488155 9.14644661,18.8535534 L7.5,17.2071068 L5.85355339,18.8535534 C5.65829124,19.0488155 5.34170876,19.0488155 5.14644661,18.8535534 C4.95118446,18.6582912 4.95118446,18.3417088 5.14644661,18.1464466 L6.79289322,16.5 L5.14644661,14.8535534 C4.95118446,14.6582912 4.95118446,14.3417088 5.14644661,14.1464466 C5.34170876,13.9511845 5.65829124,13.9511845 5.85355339,14.1464466 L7.5,15.7928932 L7.5,15.7928932 Z M4,4.5 L4,8.5 C4,8.77614237 4.22385763,9 4.5,9 L10.5,9 C10.7761424,9 11,8.77614237 11,8.5 L11,4.5 C11,4.22385763 10.7761424,4 10.5,4 L4.5,4 C4.22385763,4 4,4.22385763 4,4.5 Z M13,14.5 L13,18.5 C13,18.7761424 13.2238576,19 13.5,19 L19.5,19 C19.7761424,19 20,18.7761424 20,18.5 L20,14.5 C20,14.2238576 19.7761424,14 19.5,14 L13.5,14 C13.2238576,14 13,14.2238576 13,14.5 Z"/>
+</svg>
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index afb364e..368fa88 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: 2020-09-18 10:45-0300\n"
+"POT-Creation-Date: 2020-09-19 12:47-0300\n"
+"PO-Revision-Date: 2020-09-19 12:49-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: pt_BR\n"
@@ -55,7 +55,7 @@ msgstr "Sobre o PW3270"
 msgid "Action Name"
 msgstr "Nome da ação"
 
-#: src/objects/window/window.c:164 src/objects/toolbar/toolbar.c:135
+#: src/objects/window/window.c:184
 msgid "Action Names"
 msgstr "Nome das ações"
 
@@ -83,7 +83,7 @@ msgstr "Aplicação"
 msgid "Application menu"
 msgstr "Menu da aplicação"
 
-#: src/objects/application/actions/preferences.c:74 ui/application.xml:83
+#: src/objects/application/actions/preferences.c:76 ui/application.xml:83
 msgid "Application preferences"
 msgstr "Preferências da aplicação"
 
@@ -138,6 +138,14 @@ msgstr "_Cancelar"
 msgid "Change terminal colors"
 msgstr "Mudar cores do terminal"
 
+#: src/objects/application/actions/preferences.c:78
+msgid "Change the application preferences"
+msgstr "Modificar preferências da aplicação"
+
+#: src/objects/window/actions/sessionproperties.c:47
+msgid "Change the preferences for the active session"
+msgstr "Modificar preferências da sessão ativa"
+
 #: ui/window.xml:182 ui/window.xml:324 ui/application.xml:304
 msgid "Clear"
 msgstr "Limpar"
@@ -164,7 +172,7 @@ msgstr "Fechar janela"
 msgid "Colors"
 msgstr "Cores"
 
-#: src/objects/linux/savedesktopicon.c:94
+#: src/objects/os/linux/savedesktopicon.c:94
 msgid "Comment"
 msgstr "Comentário"
 
@@ -180,7 +188,7 @@ msgstr "Conectar ao iniciar"
 msgid "Connect to host"
 msgstr "Conectar ao servidor"
 
-#: src/objects/window/window.c:703 src/objects/window/page.c:218
+#: src/objects/window/window.c:732 src/objects/window/page.c:218
 msgid "Connected to host"
 msgstr "Conectado no servidor"
 
@@ -200,7 +208,7 @@ msgstr "Copiar como tabela"
 msgid "Copy as text"
 msgstr "Copiar como texto"
 
-#: src/objects/linux/savedesktopicon.c:107
+#: src/objects/os/linux/savedesktopicon.c:107
 msgid "Create a desktop icon for the current session"
 msgstr "Criar ícone da área de trabalho para a sessão atual."
 
@@ -236,7 +244,7 @@ msgstr "Ícone da área de trabalho"
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: src/objects/window/window.c:703 src/objects/window/window.c:730
+#: src/objects/window/window.c:732 src/objects/window/window.c:759
 #: src/objects/window/page.c:207
 msgid "Disconnected from host"
 msgstr "Desconectado do servidor"
@@ -281,7 +289,7 @@ msgstr "Apagar até o final da linha"
 msgid "Field attributes"
 msgstr "Mostra atributos de campo"
 
-#: src/objects/linux/savedesktopicon.c:74
+#: src/objects/os/linux/savedesktopicon.c:74
 msgid "File name"
 msgstr "Nome do arquivo"
 
@@ -297,7 +305,7 @@ msgstr "Tela cheia"
 msgid "Function bar"
 msgstr "Barra de funções"
 
-#: src/objects/linux/savedesktopicon.c:87
+#: src/objects/os/linux/savedesktopicon.c:87
 msgid "Generic name"
 msgstr "Nome genérico"
 
@@ -309,7 +317,7 @@ msgstr "Ajuda"
 msgid "Host properties"
 msgstr "Propriedades do Servidor"
 
-#: src/objects/window/window.c:470 src/objects/linux/savedesktopicon.c:95
+#: src/objects/window/window.c:491 src/objects/os/linux/savedesktopicon.c:95
 msgid "IBM 3270 Terminal emulator"
 msgstr "Emulador 3270"
 
@@ -325,7 +333,7 @@ msgstr "Nome do ícone"
 msgid "Icon Size"
 msgstr "Tamanho do ícone"
 
-#: src/objects/toolbar/toolbar.c:262
+#: src/objects/toolbar/toolbar.c:286
 msgid "Icon _size"
 msgstr "_Tamanho do ícone"
 
@@ -389,7 +397,7 @@ msgstr "Etiqueta"
 msgid "Large"
 msgstr "Grande"
 
-#: src/objects/linux/savedesktopicon.c:80
+#: src/objects/os/linux/savedesktopicon.c:80
 msgid "Launcher name"
 msgstr "Nome do lançador"
 
@@ -562,7 +570,7 @@ msgstr "Direita"
 msgid "Right keypad"
 msgstr "Painel direito"
 
-#: src/objects/toolbar/toolbar.c:286
+#: src/objects/toolbar/toolbar.c:310
 msgid "S_tyle"
 msgstr "E_stilo"
 
@@ -574,7 +582,7 @@ msgstr "Salvar"
 msgid "Save As"
 msgstr "Salvar Como"
 
-#: src/objects/linux/savedesktopicon.c:106
+#: src/objects/os/linux/savedesktopicon.c:106
 msgid "Save desktop icon"
 msgstr "Salvar ícone da área de trabalho"
 
@@ -587,8 +595,8 @@ msgid "Save selected"
 msgstr "Salvar seleção"
 
 #: src/objects/actions/save.c:52
-msgid "Save session properties"
-msgstr "Salvar propriedades da sessão"
+msgid "Save session preferences"
+msgstr "Salvar preferências da sessão"
 
 #: ui/window.xml:503 ui/application.xml:400
 msgid "Screen size"
@@ -654,8 +662,8 @@ msgstr "Sessão em nova janela"
 
 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
 #: ui/window.xml:554 ui/application.xml:163
-msgid "Session properties"
-msgstr "Propriedades da sessão"
+msgid "Session preferences"
+msgstr "Preferências da sessão"
 
 #: src/objects/application/application.c:219
 msgid "Set the user-interface type"
@@ -673,7 +681,7 @@ msgstr "Configura formato da barra de ferramentas"
 msgid "Setup title bar"
 msgstr "Configurar barra de título"
 
-#: src/objects/toolbar/settings.c:90
+#: src/objects/toolbar/toolbar.c:272 src/objects/toolbar/settings.c:90
 msgid "Setup toolbar"
 msgstr "Configurar barra de ferramentas"
 
@@ -753,11 +761,11 @@ msgstr "A etiqueta da ação"
 msgid "The name of associated action"
 msgstr "Nome da ação associada"
 
-#: src/objects/window/window.c:165
+#: src/objects/window/window.c:185
 msgid "The name of the actions in the header bar"
 msgstr "O nome das ações na barra de título"
 
-#: src/objects/toolbar/toolbar.c:136
+#: src/objects/toolbar/toolbar.c:138
 msgid "The name of the actions in the toolbar"
 msgstr "O nome das ações na barra de ferramentas"
 
@@ -785,11 +793,15 @@ msgstr "A posição do painel"
 msgid "The state the action is in"
 msgstr "O estado em que a ação está"
 
-#: src/objects/toolbar/toolbar.c:147
+#: src/objects/toolbar/toolbar.c:149
 msgid "The toolbar icon size"
 msgstr "Tamanho dos ícones na barra de ferramentas"
 
-#: src/objects/toolbar/toolbar.c:160
+#: src/objects/toolbar/toolbar.c:175
+msgid "The toolbar icon type"
+msgstr "Tipo dos ícones na barra de ferramentas"
+
+#: src/objects/toolbar/toolbar.c:162
 msgid "The toolbar style"
 msgstr "Estilo da barra de ferramentas"
 
@@ -860,7 +872,7 @@ msgstr "Janela com sessão padrão"
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/objects/settings/dialog.c:78 src/objects/linux/savedesktopicon.c:133
+#: src/objects/settings/dialog.c:78 src/objects/os/linux/savedesktopicon.c:133
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -896,15 +908,15 @@ msgstr "_Nova"
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/objects/toolbar/toolbar.c:308
-msgid "_Properties"
-msgstr "_Propriedades"
+#: src/objects/toolbar/toolbar.c:332
+msgid "_Preferences"
+msgstr "_Preferências"
 
 #: src/objects/window/page.c:365
 msgid "_Rename session"
 msgstr "Renomear sessão"
 
-#: src/objects/linux/savedesktopicon.c:134
+#: src/objects/os/linux/savedesktopicon.c:134
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -3909,6 +3921,9 @@ msgstr "translator-credits"
 #~ msgid "_Port:"
 #~ msgstr "_Porta:"
 
+#~ msgid "_Properties"
+#~ msgstr "_Propriedades"
+
 #~ msgid "_Receive"
 #~ msgstr "_Receber"
 
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index acb8575..955a7c7 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -6,351 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  view.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  save.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  abstract.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  application.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  window.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  preferences.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  open.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  about.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  window.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  terminal.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  page.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  header-settings.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:44-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  header.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  setcolors.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  sessionproperties.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  hostproperties.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  filetransfer.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  connect.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  close.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  toolbar.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  settings.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  dialog.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  savedesktopicon.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  tools.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  placeholders.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  model.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  element.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  attribute.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  window.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  application.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  10-bottom.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  00-right.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-18 10:42-0300\n"
+"POT-Creation-Date: 2020-09-19 12:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -394,7 +52,7 @@ msgstr ""
 msgid "Action Name"
 msgstr ""
 
-#: src/objects/window/window.c:164 src/objects/toolbar/toolbar.c:135
+#: src/objects/window/window.c:184
 msgid "Action Names"
 msgstr ""
 
@@ -422,7 +80,7 @@ msgstr ""
 msgid "Application menu"
 msgstr ""
 
-#: src/objects/application/actions/preferences.c:74 ui/application.xml:83
+#: src/objects/application/actions/preferences.c:76 ui/application.xml:83
 msgid "Application preferences"
 msgstr ""
 
@@ -477,6 +135,14 @@ msgstr ""
 msgid "Change terminal colors"
 msgstr ""
 
+#: src/objects/application/actions/preferences.c:78
+msgid "Change the application preferences"
+msgstr ""
+
+#: src/objects/window/actions/sessionproperties.c:47
+msgid "Change the preferences for the active session"
+msgstr ""
+
 #: ui/window.xml:182 ui/window.xml:324 ui/application.xml:304
 msgid "Clear"
 msgstr ""
@@ -503,7 +169,7 @@ msgstr ""
 msgid "Colors"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:94
+#: src/objects/os/linux/savedesktopicon.c:94
 msgid "Comment"
 msgstr ""
 
@@ -519,7 +185,7 @@ msgstr ""
 msgid "Connect to host"
 msgstr ""
 
-#: src/objects/window/window.c:703 src/objects/window/page.c:218
+#: src/objects/window/window.c:732 src/objects/window/page.c:218
 msgid "Connected to host"
 msgstr ""
 
@@ -539,7 +205,7 @@ msgstr ""
 msgid "Copy as text"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:107
+#: src/objects/os/linux/savedesktopicon.c:107
 msgid "Create a desktop icon for the current session"
 msgstr ""
 
@@ -575,7 +241,7 @@ msgstr ""
 msgid "Disconnect"
 msgstr ""
 
-#: src/objects/window/window.c:703 src/objects/window/window.c:730
+#: src/objects/window/window.c:732 src/objects/window/window.c:759
 #: src/objects/window/page.c:207
 msgid "Disconnected from host"
 msgstr ""
@@ -620,7 +286,7 @@ msgstr ""
 msgid "Field attributes"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:74
+#: src/objects/os/linux/savedesktopicon.c:74
 msgid "File name"
 msgstr ""
 
@@ -636,7 +302,7 @@ msgstr ""
 msgid "Function bar"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:87
+#: src/objects/os/linux/savedesktopicon.c:87
 msgid "Generic name"
 msgstr ""
 
@@ -648,7 +314,7 @@ msgstr ""
 msgid "Host properties"
 msgstr ""
 
-#: src/objects/window/window.c:470 src/objects/linux/savedesktopicon.c:95
+#: src/objects/window/window.c:491 src/objects/os/linux/savedesktopicon.c:95
 msgid "IBM 3270 Terminal emulator"
 msgstr ""
 
@@ -664,7 +330,7 @@ msgstr ""
 msgid "Icon Size"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:262
+#: src/objects/toolbar/toolbar.c:286
 msgid "Icon _size"
 msgstr ""
 
@@ -728,7 +394,7 @@ msgstr ""
 msgid "Large"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:80
+#: src/objects/os/linux/savedesktopicon.c:80
 msgid "Launcher name"
 msgstr ""
 
@@ -901,7 +567,7 @@ msgstr ""
 msgid "Right keypad"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:286
+#: src/objects/toolbar/toolbar.c:310
 msgid "S_tyle"
 msgstr ""
 
@@ -913,7 +579,7 @@ msgstr ""
 msgid "Save As"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:106
+#: src/objects/os/linux/savedesktopicon.c:106
 msgid "Save desktop icon"
 msgstr ""
 
@@ -926,7 +592,7 @@ msgid "Save selected"
 msgstr ""
 
 #: src/objects/actions/save.c:52
-msgid "Save session properties"
+msgid "Save session preferences"
 msgstr ""
 
 #: ui/window.xml:503 ui/application.xml:400
@@ -993,7 +659,7 @@ msgstr ""
 
 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
 #: ui/window.xml:554 ui/application.xml:163
-msgid "Session properties"
+msgid "Session preferences"
 msgstr ""
 
 #: src/objects/application/application.c:219
@@ -1012,7 +678,7 @@ msgstr ""
 msgid "Setup title bar"
 msgstr ""
 
-#: src/objects/toolbar/settings.c:90
+#: src/objects/toolbar/toolbar.c:272 src/objects/toolbar/settings.c:90
 msgid "Setup toolbar"
 msgstr ""
 
@@ -1092,11 +758,11 @@ msgstr ""
 msgid "The name of associated action"
 msgstr ""
 
-#: src/objects/window/window.c:165
+#: src/objects/window/window.c:185
 msgid "The name of the actions in the header bar"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:136
+#: src/objects/toolbar/toolbar.c:138
 msgid "The name of the actions in the toolbar"
 msgstr ""
 
@@ -1124,11 +790,15 @@ msgstr ""
 msgid "The state the action is in"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:147
+#: src/objects/toolbar/toolbar.c:149
 msgid "The toolbar icon size"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:160
+#: src/objects/toolbar/toolbar.c:175
+msgid "The toolbar icon type"
+msgstr ""
+
+#: src/objects/toolbar/toolbar.c:162
 msgid "The toolbar style"
 msgstr ""
 
@@ -1199,7 +869,7 @@ msgstr ""
 msgid "_Apply"
 msgstr ""
 
-#: src/objects/settings/dialog.c:78 src/objects/linux/savedesktopicon.c:133
+#: src/objects/settings/dialog.c:78 src/objects/os/linux/savedesktopicon.c:133
 msgid "_Cancel"
 msgstr ""
 
@@ -1235,15 +905,15 @@ msgstr ""
 msgid "_Open"
 msgstr ""
 
-#: src/objects/toolbar/toolbar.c:308
-msgid "_Properties"
+#: src/objects/toolbar/toolbar.c:332
+msgid "_Preferences"
 msgstr ""
 
 #: src/objects/window/page.c:365
 msgid "_Rename session"
 msgstr ""
 
-#: src/objects/linux/savedesktopicon.c:134
+#: src/objects/os/linux/savedesktopicon.c:134
 msgid "_Save"
 msgstr ""
 
diff --git a/src/objects/window/header.c b/src/objects/window/header.c
index 0489709..d88eaa7 100644
--- a/src/objects/window/header.c
+++ b/src/objects/window/header.c
@@ -125,7 +125,7 @@
 
 	GtkWidget * button = NULL;
 	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
-	gboolean symbolic = g_settings_get_int(settings,"header-icon-type") == 0;
+	gboolean symbolic = g_settings_get_int(settings,"header-icon-type") == 1;
 
 	if(g_str_has_prefix(action_name,"menu.")) {
 
--
libgit2 0.21.2