diff --git a/po/com.github.artemanufrij.webpin.pot b/po/com.github.artemanufrij.webpin.pot
index 3e88a39..e36e46e 100644
--- a/po/com.github.artemanufrij.webpin.pot
+++ b/po/com.github.artemanufrij.webpin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-15 19:26+0200\n"
+"POT-Creation-Date: 2017-11-28 23:46+0400\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"
@@ -17,110 +17,131 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Dialogs/InfoDialog.vala:44
-msgid "Accept"
+#: ../src/Dialogs/Preferences.vala:60
+msgid "Use Dark Theme"
 msgstr ""
 
-#: ../src/WebWindow.vala:53
-msgid "Copy URI into clipboard"
+#: ../src/Dialogs/Preferences.vala:73
+msgid "_Close"
 msgstr ""
 
-#: ../src/WebWindow.vala:65 ../src/Widgets/Assistant.vala:118
-msgid "Run in background when closed"
-msgstr ""
-
-#: ../src/WebWindow.vala:115
-msgid "Open %s"
-msgstr ""
-
-#: ../src/MainWindow.vala:56
+#: ../src/MainWindow.vala:68
 msgid "Applications"
 msgstr ""
 
-#: ../src/MainWindow.vala:62
+#: ../src/MainWindow.vala:75
 msgid "Add a new Web App"
 msgstr ""
 
-#: ../src/MainWindow.vala:65
+#: ../src/MainWindow.vala:87
+msgid "Preferences"
+msgstr ""
+
+#: ../src/MainWindow.vala:99
 msgid "No Web Apps Available"
 msgstr ""
 
-#: ../src/MainWindow.vala:65
+#: ../src/MainWindow.vala:99
 msgid "Manage your web apps."
 msgstr ""
 
-#: ../src/MainWindow.vala:66
+#: ../src/MainWindow.vala:100
 msgid "Create App"
 msgstr ""
 
-#: ../src/MainWindow.vala:66
+#: ../src/MainWindow.vala:100
 msgid "Create a new web app with Webpin"
 msgstr ""
 
-#: ../src/Widgets/WebApp.vala:94
-msgid "Open request in an external application…"
+#: ../src/Services/DesktopFilesManager.vala:84
+msgid "Choose an image…"
 msgstr ""
 
-#: ../src/Widgets/Assistant.vala:74
-msgid "Create a new web app"
+#: ../src/Services/DesktopFilesManager.vala:86
+msgid "_Cancel"
 msgstr ""
 
-#: ../src/Widgets/Assistant.vala:82
-msgid "Application name"
+#: ../src/Services/DesktopFilesManager.vala:87
+msgid "_Open"
 msgstr ""
 
-#: ../src/Widgets/Assistant.vala:85
-msgid "http://myapp.domain"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:95
-msgid "theme icon name"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:97
-msgid "or"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:98
-msgid "Set from file..."
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:114
-msgid "Save cookies"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:116
-msgid "Save login information"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:141
-msgid "Save app"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:163
-msgid "url must start with http:// or https://"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:176
-msgid "App already exist"
-msgstr ""
-
-#: ../src/Widgets/Assistant.vala:229
+#: ../src/Services/DesktopFilesManager.vala:90
+#: ../src/Widgets/Views/Editor.vala:237
 msgid "Images"
 msgstr ""
 
-#: ../src/Widgets/Assistant.vala:241
+#: ../src/Widgets/Browser.vala:108
+msgid "Open request in an external application…"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:80
+msgid "Create a new web app"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:88
+msgid "Application name"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:91
+msgid "http://myapp.domain"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:101
+msgid "theme icon name"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:103
+msgid "or"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:104
+msgid "Set from file..."
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:123
+msgid "Save cookies"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:125
+msgid "Save login information"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:127 ../src/Windows/WebApp.vala:67
+msgid "Run in background if closed"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:150
+msgid "Save app"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:172
+msgid "url must start with http:// or https://"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:185
+msgid "App already exist"
+msgstr ""
+
+#: ../src/Widgets/Views/Editor.vala:242
 msgid "Cancel"
 msgstr ""
 
-#: ../src/Widgets/Assistant.vala:242
+#: ../src/Widgets/Views/Editor.vala:243
 msgid "Open"
 msgstr ""
 
-#: ../src/Widgets/ApplicationIcon.vala:142
+#: ../src/Widgets/WebItem.vala:120
 msgid "Delete Webapp"
 msgstr ""
 
-#: ../src/Widgets/ApplicationIcon.vala:147
+#: ../src/Widgets/WebItem.vala:125
 msgid "Edit Webapp Properties"
 msgstr ""
+
+#: ../src/Windows/WebApp.vala:55
+msgid "Copy URL into clipboard"
+msgstr ""
+
+#: ../src/Windows/WebApp.vala:103
+msgid "Open %s"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 822a2c2..a0ba775 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,128 +8,161 @@ msgid ""
 msgstr ""
 "Project-Id-Version: webby-browser\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-09 21:07+0400\n"
-"PO-Revision-Date: 2017-09-09 21:25+0400\n"
-"Last-Translator: Андрей Культяпов <camellan@yandex.ru>\n"
+"POT-Creation-Date: 2017-11-28 23:46+0400\n"
+"PO-Revision-Date: 2017-11-28 23:50+0400\n"
+"Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
-"Language: ru\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2015-03-24 00:16+0000\n"
-"X-Generator: Poedit 2.0\n"
+"X-Generator: Poedit 2.0.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Basepath: ../src\n"
+"X-Poedit-SearchPath-0: .\n"
 
-#: ../src/WebWindow.vala:61 ../src/Widgets/Assistant.vala:118
-msgid "Run in background when closed"
-msgstr "Работать в фоновом режиме после закрытия"
+#: ../src/Dialogs/Preferences.vala:60
+msgid "Use Dark Theme"
+msgstr "Использовать тёмную тему"
 
-#: ../src/WebWindow.vala:73 ../src/WebWindow.vala:83
-msgid "Unmute notifications"
-msgstr "Включить уведомления"
+#: ../src/Dialogs/Preferences.vala:73
+msgid "_Close"
+msgstr "_Закрыть"
 
-#: ../src/WebWindow.vala:76 ../src/WebWindow.vala:86
-msgid "Mute notifications"
-msgstr "Отключить уведомления"
-
-#: ../src/WebWindow.vala:88
-msgid "Desktop notifications are enabled"
-msgstr "Уведомления включены"
-
-#: ../src/Dialogs/InfoDialog.vala:44
-msgid "Accept"
-msgstr "Согласен"
-
-#: ../src/MainWindow.vala:56
+#: ../src/MainWindow.vala:68
 msgid "Applications"
 msgstr "Приложения"
 
-#: ../src/MainWindow.vala:62
+#: ../src/MainWindow.vala:75
 msgid "Add a new Web App"
 msgstr "Добавить новое веб-приложение"
 
-#: ../src/MainWindow.vala:65
+#: ../src/MainWindow.vala:87
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../src/MainWindow.vala:99
 msgid "No Web Apps Available"
 msgstr "Нет доступных веб-приложений"
 
-#: ../src/MainWindow.vala:65
+#: ../src/MainWindow.vala:99
 msgid "Manage your web apps."
 msgstr "Управляйте своими веб-приложениями."
 
-#: ../src/MainWindow.vala:66
+#: ../src/MainWindow.vala:100
 msgid "Create App"
 msgstr "Создать приложение"
 
-#: ../src/MainWindow.vala:66
+#: ../src/MainWindow.vala:100
 msgid "Create a new web app with Webpin"
 msgstr "Создайте новое веб-приложение с помощью Webpin"
 
-#: ../src/Widgets/Assistant.vala:74
-msgid "Create a new web app"
-msgstr "Создать новое веб-приложение"
+#: ../src/Services/DesktopFilesManager.vala:84
+msgid "Choose an image…"
+msgstr "Выбрать изображение…"
 
-#: ../src/Widgets/Assistant.vala:82
-msgid "Application name"
-msgstr "Имя приложения"
+#: ../src/Services/DesktopFilesManager.vala:86
+msgid "_Cancel"
+msgstr "_Отмена"
 
-#: ../src/Widgets/Assistant.vala:85
-msgid "http://myapp.domain"
-msgstr "http://myapp.domain"
+#: ../src/Services/DesktopFilesManager.vala:87
+msgid "_Open"
+msgstr "_Открыть"
 
-#: ../src/Widgets/Assistant.vala:95
-msgid "theme icon name"
-msgstr "имя иконки из темы"
-
-#: ../src/Widgets/Assistant.vala:97
-msgid "or"
-msgstr "или"
-
-#: ../src/Widgets/Assistant.vala:98
-msgid "Set from file..."
-msgstr "Установить из файла..."
-
-#: ../src/Widgets/Assistant.vala:114
-msgid "Save cookies"
-msgstr "Сохранить cookies"
-
-#: ../src/Widgets/Assistant.vala:116
-msgid "Save login information"
-msgstr "Сохранить данные авторизации"
-
-#: ../src/Widgets/Assistant.vala:141
-msgid "Save app"
-msgstr "Сохранить приложение"
-
-#: ../src/Widgets/Assistant.vala:163
-msgid "url must start with http:// or https://"
-msgstr "адрес должен начинаться с http:// или https://"
-
-#: ../src/Widgets/Assistant.vala:176
-msgid "App already exist"
-msgstr "Это приложение уже существует"
-
-#: ../src/Widgets/Assistant.vala:229
+#: ../src/Services/DesktopFilesManager.vala:90
+#: ../src/Widgets/Views/Editor.vala:237
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/Widgets/Assistant.vala:241
+#: ../src/Widgets/Browser.vala:108
+msgid "Open request in an external application…"
+msgstr "Открыть запрос во внешнем приложении…"
+
+#: ../src/Widgets/Views/Editor.vala:80
+msgid "Create a new web app"
+msgstr "Создать новое веб-приложение"
+
+#: ../src/Widgets/Views/Editor.vala:88
+msgid "Application name"
+msgstr "Имя приложения"
+
+#: ../src/Widgets/Views/Editor.vala:91
+msgid "http://myapp.domain"
+msgstr "http://myapp.domain"
+
+#: ../src/Widgets/Views/Editor.vala:101
+msgid "theme icon name"
+msgstr "имя иконки из темы"
+
+#: ../src/Widgets/Views/Editor.vala:103
+msgid "or"
+msgstr "или"
+
+#: ../src/Widgets/Views/Editor.vala:104
+msgid "Set from file..."
+msgstr "Установить из файла..."
+
+#: ../src/Widgets/Views/Editor.vala:123
+msgid "Save cookies"
+msgstr "Сохранить cookies"
+
+#: ../src/Widgets/Views/Editor.vala:125
+msgid "Save login information"
+msgstr "Сохранить данные авторизации"
+
+#: ../src/Widgets/Views/Editor.vala:127 ../src/Windows/WebApp.vala:67
+msgid "Run in background if closed"
+msgstr "Работать в фоновом режиме после закрытия"
+
+#: ../src/Widgets/Views/Editor.vala:150
+msgid "Save app"
+msgstr "Сохранить приложение"
+
+#: ../src/Widgets/Views/Editor.vala:172
+msgid "url must start with http:// or https://"
+msgstr "адрес должен начинаться с http:// или https://"
+
+#: ../src/Widgets/Views/Editor.vala:185
+msgid "App already exist"
+msgstr "Это приложение уже существует"
+
+#: ../src/Widgets/Views/Editor.vala:242
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../src/Widgets/Assistant.vala:242
+#: ../src/Widgets/Views/Editor.vala:243
 msgid "Open"
 msgstr "Открыть"
 
-#: ../src/Widgets/ApplicationIcon.vala:142
+#: ../src/Widgets/WebItem.vala:120
 msgid "Delete Webapp"
 msgstr "Удалить веб-приложение"
 
-#: ../src/Widgets/ApplicationIcon.vala:147
+#: ../src/Widgets/WebItem.vala:125
 msgid "Edit Webapp Properties"
 msgstr "Редактировать веб-приложение"
 
-#: ../src/Widgets/WebApp.vala:93
-msgid "Open request in an external application…"
-msgstr "Открыть запрос во внешнем приложении…"
+#: ../src/Windows/WebApp.vala:55
+msgid "Copy URL into clipboard"
+msgstr "Копировать ссылку в буфер обмена"
+
+#: ../src/Windows/WebApp.vala:103
+msgid "Open %s"
+msgstr "Открыть %s"
+
+#~ msgid "Accept"
+#~ msgstr "Согласен"
+
+#~ msgid "Unmute notifications"
+#~ msgstr "Включить уведомления"
+
+#~ msgid "Mute notifications"
+#~ msgstr "Отключить уведомления"
+
+#~ msgid "Desktop notifications are enabled"
+#~ msgstr "Уведомления включены"
 
 #~ msgid "Create a new Webpin Web App."
 #~ msgstr "Создать новое веб-приложение в Webpin."
diff --git a/src/Dialogs/Preferences.vala b/src/Dialogs/Preferences.vala
index 81b77e6..1d00c9c 100644
--- a/src/Dialogs/Preferences.vala
+++ b/src/Dialogs/Preferences.vala
@@ -70,7 +70,7 @@ namespace Webpin.Dialogs {
 
             content.pack_start (grid, false, false, 0);
 
-            this.add_button ("_Close", Gtk.ResponseType.CLOSE);
+            this.add_button (_("_Close"), Gtk.ResponseType.CLOSE);
             this.show_all ();
         }
     }