diff --git a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
index 78db75c..5c90390 100644
--- a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
+++ b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
@@ -123,6 +123,7 @@
         self._allow_edit = self._has_access_to_write(self._config_path)
         self._widgets.infobar.props.visible = not self._allow_edit
         self._widgets.apply.props.visible = self._allow_edit
+
         if not self._allow_edit:
             helpers.show_message(
                 text=_('No permissions to save configuration'),
@@ -254,9 +255,9 @@
             self._entry_menu.append(self._entry_menu_default_item)
             self._entry_menu.show_all()
 
-        def format_value(value=None, enabled=None):
-            if enabled is not None:
-                return _('<i>enabled</i>') if initial.enabled else _('<i>disabled</i>')
+        def format_value(value=None, enabled=True):
+            if not enabled:
+                return _('<i>disabled</i>')
             if value == '':
                 return _('<i>empty string</i>')
             elif value is None:
@@ -267,17 +268,17 @@
         self._entry_menu_label_item.props.label = '{key} = {value}'.format(
             group=group.name,
             key=key,
-            value=format_value(value=entry.value))
+            value=format_value(value=entry.value, enabled=entry.enabled))
 
         if entry in self._changed_entries:
             initial = self._initial_values[entry]
+
             if entry.enabled != initial.enabled and not initial.enabled:
-                value = format_value(enabled=initial.enabled)
                 self._entry_menu_initial_item._reset_entry_data = entry, None, initial.enabled
             else:
-                value = format_value(value=initial.value)
                 self._entry_menu_initial_item._reset_entry_data = entry, initial.value, None
 
+            value = format_value(value=initial.value, enabled=initial.enabled)
             self._entry_menu_initial_item.set_tooltip_markup(value)
             self._entry_menu_initial_item.props.visible = True
             self._entry_menu_initial_item.props.label = \
diff --git a/lightdm_gtk_greeter_settings/OptionEntry.py b/lightdm_gtk_greeter_settings/OptionEntry.py
index 389687c..8ddf715 100644
--- a/lightdm_gtk_greeter_settings/OptionEntry.py
+++ b/lightdm_gtk_greeter_settings/OptionEntry.py
@@ -70,21 +70,17 @@
     @value.setter
     def value(self, value):
         if self.__use:
-            self.__use.props.active = True
+            self.__use.set_active(True)
         formatted = self.set.emit(value)
         self._set_value(value if formatted is None else formatted)
 
     @property
     def enabled(self):
-        '''Visual option state. You can get/set value of disabled option'''
-        if self.__use:
-            return self.__use.props.active
-        return True
+        return self._get_enabled()
 
     @enabled.setter
     def enabled(self, value):
-        if self.__use:
-            self.__use.props.active = value
+        self._set_enabled(value)
 
     @property
     def error(self):
@@ -134,12 +130,18 @@
             self.__error.props.visible = text is not None
             self.__error.props.tooltip_text = text
 
+    def _get_enabled(self):
+        if self.__use:
+            return self.__use.get_active()
+        return True
+
     def _set_enabled(self, value):
         if self.__use:
-            self.__use.props.active = value
-        if self._widgets_to_disable:
-            for widget in self._widgets_to_disable:
-                widget.props.sensitive = value
+            self.__use.set_active(value)
+            if self._widgets_to_disable:
+                for widget in self._widgets_to_disable:
+                    widget.props.sensitive = value
+        self._emit_changed()
 
     def _show_menu(self):
         self.__on_label_clicked()
@@ -147,9 +149,8 @@
     def _emit_changed(self, *unused):
         self.changed.emit()
 
-    def __on_use_toggled(self, toggle, *args):
+    def __on_use_toggled(self, toggle, *unused):
         self._set_enabled(self.__use.props.active)
-        self._emit_changed()
 
 
 class BooleanEntry(BaseEntry):
diff --git a/lightdm_gtk_greeter_settings/OptionGroup.py b/lightdm_gtk_greeter_settings/OptionGroup.py
index 31c9776..a08103d 100644
--- a/lightdm_gtk_greeter_settings/OptionGroup.py
+++ b/lightdm_gtk_greeter_settings/OptionGroup.py
@@ -104,10 +104,11 @@
             config.add_section(self._name)
 
         for key, entry in self._entries.items():
-            if entry.enabled:
+            value = entry.value
+            if entry.enabled and value != self._get_default(key):
                 config.set(self._name, key, entry.value)
             else:
                 config.remove_option(self._name, key)
 
     def _get_default(self, key):
-        return self._defaults[key]
+        return self._defaults.get(key)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c36f77..fdbc168 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@
 [type: gettext/glade]data/GtkGreeterSettingsWindow.ui
 [type: gettext/glade]data/IconChooserDialog.ui
 [type: gettext/glade]data/ImageChooserDialog.ui
-[type: gettext/glade]data/IndicatorChooserDialog.ui
+[type: gettext/glade]data/IndicatorPropertiesDialog.ui
 [type: gettext/glade]data/MultiheadSetupDialog.ui
 
 # Python Files
@@ -13,8 +13,13 @@
 lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
 lightdm_gtk_greeter_settings/helpers.py
 lightdm_gtk_greeter_settings/IconChooserDialog.py
-lightdm_gtk_greeter_settings/IndicatorChooserDialog.py
+lightdm_gtk_greeter_settings/IndicatorPropertiesDialog.py
+lightdm_gtk_greeter_settings/IndicatorsEntry.py
+lightdm_gtk_greeter_settings/MonitorsGroup.py
 lightdm_gtk_greeter_settings/MultiheadSetupDialog.py
 lightdm_gtk_greeter_settings/OptionEntry.py
+lightdm_gtk_greeter_settings/OptionGroup.py
+lightdm_gtk_greeter_settings/PositionEntry.py
+
 
 com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy.in
diff --git a/po/lightdm-gtk-greeter-settings.pot b/po/lightdm-gtk-greeter-settings.pot
index 5cdfe0f..cf82c1d 100644
--- a/po/lightdm-gtk-greeter-settings.pot
+++ b/po/lightdm-gtk-greeter-settings.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-02 00:39+0300\n"
+"POT-Creation-Date: 2015-01-25 18:54+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"
@@ -32,179 +32,139 @@
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:3
-msgctxt "option|greeter|indicators"
-msgid "Host name"
+msgid "LightDM GTK+ Greeter: settings"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:4
-msgctxt "option|greeter|indicators"
-msgid "Clock"
+msgctxt "option|greeter|xft-rgba"
+msgid "None"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:5
-msgctxt "option|greeter|indicators"
-msgid "Layout indicator"
+msgctxt "option|greeter|xft-rgba"
+msgid "RGB"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:6
-msgctxt "option|greeter|indicators"
-msgid "Sessions menu (xfce, unity, gnome etc.)"
+msgctxt "option|greeter|xft-rgba"
+msgid "BGR"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:7
-msgctxt "option|greeter|indicators"
-msgid "Languages menu"
+msgctxt "option|greeter|xft-rgba"
+msgid "Vertical RGB"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:8
-msgctxt "option|greeter|indicators"
-msgid "Accessibility menu"
+msgctxt "option|greeter|xft-rgba"
+msgid "Vertical BGR"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:9
-msgctxt "option|greeter|indicators"
-msgid "Power menu"
+msgctxt "option|greeter|xft-hintstyle"
+msgid "None"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:10
-msgid "LightDM GTK+ Greeter: settings"
+msgctxt "option|greeter|xft-hintstyle"
+msgid "Slight"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:11
+msgctxt "option|greeter|xft-hintstyle"
+msgid "Medium"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:12
+msgctxt "option|greeter|xft-hintstyle"
+msgid "Full"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:13
+msgctxt "option|greeter|xft-antialias"
+msgid "Antialias"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:14
+msgid "Enable this option to override system defaults"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:15
+msgctxt "option|greeter|xft-dpi"
+msgid "DPI"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:16
+msgctxt "option|greeter|xft-rgba"
+msgid "Subpixel rendering"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:17
+msgctxt "option|greeter|xft-hintstyle"
+msgid "Hinting"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:18
+msgid "Additional font options"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:19
+msgctxt "option|greeter|background"
+msgid "Background"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:20
+msgctxt "option|multihead"
+msgid ""
+" <i>(or use <a href=\"\">multihead setup</a> for individual monitors)</i>"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:21
+msgctxt "option|greeter|background"
+msgid "Color"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:22
+msgctxt "option|greeter|background"
+msgid "Image"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:23
 msgctxt "option|greeter|theme-name"
 msgid "Theme"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:12
+#: ../data/GtkGreeterSettingsWindow.ui.h:24
 msgctxt "option|greeter|icon-theme-name"
 msgid "Icons"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:13
+#: ../data/GtkGreeterSettingsWindow.ui.h:25
 msgctxt "option|greeter|font-name"
 msgid "Font"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:14
-msgctxt "option|greeter|xft-rgba"
-msgid "Subpixel rendering"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:15
-msgid "Enable this option to override system defaults"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:16
-msgctxt "option|greeter|xft-dpi"
-msgid "DPI"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:17
-msgctxt "option|greeter|xft-antialias"
-msgid "Antialias"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:18
-msgctxt "option|greeter|xft-hintstyle"
-msgid "Hinting"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:19
-msgctxt "option|greeter|xft-rgba"
-msgid "None"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:20
-msgctxt "option|greeter|xft-rgba"
-msgid "RGB"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:21
-msgctxt "option|greeter|xft-rgba"
-msgid "BGR"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:22
-msgctxt "option|greeter|xft-rgba"
-msgid "Vertical RGB"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:23
-msgctxt "option|greeter|xft-rgba"
-msgid "Vertical BGR"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:24
-msgctxt "option|greeter|xft-hintstyle"
-msgid "None"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:25
-msgctxt "option|greeter|xft-hintstyle"
-msgid "Slight"
-msgstr ""
-
 #: ../data/GtkGreeterSettingsWindow.ui.h:26
-msgctxt "option|greeter|xft-hintstyle"
-msgid "Medium"
+msgctxt "option|greeter|hide-user-image"
+msgid "User image"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:27
-msgctxt "option|greeter|xft-hintstyle"
-msgid "Full"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:28
-msgid "Additional font options"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:29
-msgctxt "option|greeter|background"
-msgid "Image"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:30
-msgctxt "option|greeter|background"
-msgid "Color"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:31
 msgctxt "option|greeter|default-user-image"
 msgid "Default user image"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:32
+#: ../data/GtkGreeterSettingsWindow.ui.h:28
 msgctxt "option|greeter|user-background"
 msgid "Use user wallpaper if available"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:33
-msgctxt "option|greeter|background"
-msgid "Background"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:34
-msgctxt "option|multihead"
-msgid ""
-" <i>(or use <a href=\"\">multihead setup</a> for individual monitors)</i>"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:35
-msgctxt "option|greeter|hide-user-image"
-msgid "User image"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:36
+#: ../data/GtkGreeterSettingsWindow.ui.h:29
 msgctxt "tabs"
 msgid "Appearance"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:37
-msgctxt "option|greeter|indicators"
-msgid "Redefine indicators"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:39
+#: ../data/GtkGreeterSettingsWindow.ui.h:31
 #, no-c-format
 msgctxt "option|greeter|clock-format"
 msgid ""
@@ -213,191 +173,213 @@
 "%a %A - day of the week, %b %B - month name"
 msgstr ""
 
+#: ../data/GtkGreeterSettingsWindow.ui.h:34
+msgctxt "option|greeter|indicators"
+msgid "Add indicator to list"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:35
+msgctxt "option|greeter|indicators"
+msgid "Add"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:36
+msgctxt "option|greeter|indicators"
+msgid "Remove indicator from list"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:37
+msgctxt "option|greeter|indicators"
+msgid "Remove"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:38
+msgctxt "option|greeter|indicators"
+msgid "Move up"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:39
+msgctxt "option|greeter|indicators"
+msgid "Up"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:40
+msgctxt "option|greeter|indicators"
+msgid "Move down"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:41
+msgctxt "option|greeter|indicators"
+msgid "Down"
+msgstr ""
+
 #: ../data/GtkGreeterSettingsWindow.ui.h:42
 msgctxt "option|greeter|indicators"
-msgid "Add indicator to list"
+msgid "Templates"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:43
-msgctxt "option|greeter|indicators"
-msgid "Add"
+msgctxt "option|greeter|clock-format"
+msgid "Clock format:"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:44
 msgctxt "option|greeter|indicators"
-msgid "Remove indicator from list"
+msgid "Redefine indicators"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:45
-msgctxt "option|greeter|indicators"
-msgid "Remove"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:46
-msgctxt "option|greeter|indicators"
-msgid "Move up"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:47
-msgctxt "option|greeter|indicators"
-msgid "Up"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:48
-msgctxt "option|greeter|indicators"
-msgid "Move down"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:49
-msgctxt "option|greeter|indicators"
-msgid "Down"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:50
-msgctxt "option|greeter|clock-format"
-msgid "Clock format:"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:51
 msgctxt "tabs"
 msgid "Panel"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:52
-msgctxt "option|greeter|position"
-msgid "Select base point and its position."
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:53
+#: ../data/GtkGreeterSettingsWindow.ui.h:46
 msgctxt "option|greeter|position"
 msgid "Horizontal"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:54
+#: ../data/GtkGreeterSettingsWindow.ui.h:47
 msgctxt "option|greeter|position"
 msgid "Vertical"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:55
+#: ../data/GtkGreeterSettingsWindow.ui.h:48
 msgid "0"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:57
+#: ../data/GtkGreeterSettingsWindow.ui.h:50
 #, no-c-format
 msgctxt "option|greeter|position"
 msgid "in %"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:58
+#: ../data/GtkGreeterSettingsWindow.ui.h:51
 msgctxt "option|greeter|position"
 msgid "from right"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:59
+#: ../data/GtkGreeterSettingsWindow.ui.h:52
 msgctxt "option|greeter|position"
 msgid "from bottom"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:60
+#: ../data/GtkGreeterSettingsWindow.ui.h:53
+msgctxt "option|greeter|position"
+msgid "Select base point and its position."
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:54
 msgctxt "tabs"
 msgid "Window position"
 msgstr ""
 
+#: ../data/GtkGreeterSettingsWindow.ui.h:55
+msgctxt "option|greeter|screensaver-timeout"
+msgid "Never"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:56
+msgid "Accessibility"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:57
+msgctxt "option|greeter|reader"
+msgid "Select path to reader..."
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:58
+msgctxt "option|greeter|reader"
+msgid "Command to launch screen reader"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:59
+msgctxt "option|greeter|keyboard"
+msgid "Select path to keyboard..."
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:60
+msgctxt "option|greeter|keyboard"
+msgid "Command to launch on-screen keyboard"
+msgstr ""
+
 #: ../data/GtkGreeterSettingsWindow.ui.h:61
+msgctxt "option|greeter|a11y-states"
+msgid "Disabled at start"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:62
+msgctxt "option|greeter|a11y-states"
+msgid "Enabled at start"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:63
+msgctxt "option|greeter|a11y-states"
+msgid "Save state between launches"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:64
+msgctxt "option|greeter|a11y-theme"
+msgid "Contrast theme"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:65
+msgctxt "option|greeter|a11y-font"
+msgid "Large font"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:66
+msgctxt "greeter|option|reader"
+msgid "Reader"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:67
+msgctxt "greeter|option|keyboard"
+msgid "Keyboard"
+msgstr ""
+
+#: ../data/GtkGreeterSettingsWindow.ui.h:68
 msgctxt "option|greeter|screensaver-timeout"
 msgid "Timeout until the screen blanks "
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:62
-msgctxt "option|greeter|screensaver-timeout"
-msgid "Never"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:63
-msgid "Accessibility"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:64
-msgctxt "greeter|option|keyboard"
-msgid "Keyboard"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:65
-msgctxt "greeter|option|reader"
-msgid "Reader"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:66
-msgctxt "option|greeter|reader"
-msgid "Select path to reader..."
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:67
-msgctxt "option|greeter|reader"
-msgid "Command to launch screen reader"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:68
-msgctxt "option|greeter|keyboard"
-msgid "Select path to keyboard..."
-msgstr ""
-
 #: ../data/GtkGreeterSettingsWindow.ui.h:69
-msgctxt "option|greeter|keyboard"
-msgid "Command to launch on-screen keyboard"
+msgctxt "greeter|option|allow-debugging"
+msgid "Debugging mode"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:70
-msgctxt "option|greeter|a11y-states"
-msgid "Disabled at start"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:71
-msgctxt "option|greeter|a11y-states"
-msgid "Enabled at start"
+msgctxt "greeter|option|allow-debugging"
+msgid ""
+"Enable keys to launch GtkInspector\n"
+"More informative log"
 msgstr ""
 
 #: ../data/GtkGreeterSettingsWindow.ui.h:72
-msgctxt "option|greeter|a11y-states"
-msgid "Save state between launches"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:73
-msgctxt "option|greeter|a11y-theme"
-msgid "Contrast theme"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:74
-msgctxt "option|greeter|a11y-font"
-msgid "Large font"
-msgstr ""
-
-#: ../data/GtkGreeterSettingsWindow.ui.h:75
 msgctxt "tabs"
 msgid "Misc."
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:76
+#: ../data/GtkGreeterSettingsWindow.ui.h:73
 msgid "You don't have permissions to change greeter configuration"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:77
-#: ../data/IndicatorChooserDialog.ui.h:2
+#: ../data/GtkGreeterSettingsWindow.ui.h:74
+#: ../data/IndicatorPropertiesDialog.ui.h:3
 msgctxt "button"
 msgid "_Close"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:78
+#: ../data/GtkGreeterSettingsWindow.ui.h:75
 msgctxt "button"
 msgid "_Save"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:79
+#: ../data/GtkGreeterSettingsWindow.ui.h:76
 msgctxt "button"
 msgid "_Reload"
 msgstr ""
 
-#: ../data/GtkGreeterSettingsWindow.ui.h:80
+#: ../data/GtkGreeterSettingsWindow.ui.h:77
 msgid "Read configuration file"
 msgstr ""
 
@@ -411,13 +393,13 @@
 msgid "_Cancel"
 msgstr ""
 
-#: ../data/IconChooserDialog.ui.h:3 ../data/IndicatorChooserDialog.ui.h:3
+#: ../data/IconChooserDialog.ui.h:3 ../data/IndicatorPropertiesDialog.ui.h:4
 #: ../data/MultiheadSetupDialog.ui.h:6
 msgctxt "button"
 msgid "_OK"
 msgstr ""
 
-#: ../data/IconChooserDialog.ui.h:4 ../data/IndicatorChooserDialog.ui.h:4
+#: ../data/IconChooserDialog.ui.h:4
 msgid "Add selected indicator to the list and close this window"
 msgstr ""
 
@@ -442,69 +424,87 @@
 msgstr ""
 
 #: ../data/ImageChooserDialog.ui.h:1
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:186
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:205
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:238
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:251
 msgid "_Cancel"
 msgstr ""
 
 #: ../data/ImageChooserDialog.ui.h:2
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:185
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:204
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:237
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:250
 msgid "_OK"
 msgstr ""
 
-#: ../data/IndicatorChooserDialog.ui.h:1
-msgctxt "indicators-dialog"
-msgid "Select indicator"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:5
+#: ../data/IndicatorPropertiesDialog.ui.h:1
+msgctxt "option-entry|indicators"
+msgid "Select file..."
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:2
+msgctxt "option-entry|indicators"
+msgid "Indicator properties"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:5
 msgctxt "button"
 msgid "_Add"
 msgstr ""
 
-#: ../data/IndicatorChooserDialog.ui.h:6
-msgid "Add selected indicator to the list without closing this window"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:7
-msgctxt "indicators-dialog"
-msgid "Short name"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:8
-msgctxt "indicators-dialog"
-msgid "Indicators that greeter can find without using absolute pathes"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:9
-msgctxt "indicators-dialog"
-msgid "Path"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:10
-msgctxt "indicators-dialog"
-msgid "Absolute path to indicator library file (*.so)"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:11
-msgctxt "indicators-dialog"
-msgid "Fills the maximum available space"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:12
-msgctxt "indicators-dialog"
-msgid "Spacer"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:13
-msgctxt "indicators-dialog"
-msgid "Separator"
-msgstr ""
-
-#: ../data/IndicatorChooserDialog.ui.h:14
-msgctxt "indicators-dialog"
-msgid "Draw a separator"
+#: ../data/IndicatorPropertiesDialog.ui.h:6
+msgctxt "option-entry|indicators"
+msgid "Indicator"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:7
+msgctxt "option-entry|indicators"
+msgid "Display label"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:8
+msgctxt "option-entry|indicators"
+msgid "Leave empty to use default value"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:9
+msgctxt "option-entry|indicators"
+msgid "Display image"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:10
+msgctxt "option-entry|indicators"
+msgid "Indicator library/service:"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:11
+msgid "page 1"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:12
+msgctxt "option-entry|indicators"
+msgid "Hide disabled power actions"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:13
+msgid "page 2"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:14
+msgctxt "option-entry|indicators"
+msgid "Text to display:"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:15
+msgid "page 3"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:16
+msgctxt "option-entry|indicators"
+msgid "Spacer - fills the maximum available space"
+msgstr ""
+
+#: ../data/IndicatorPropertiesDialog.ui.h:17
+msgctxt "option-entry|indicators"
+msgid "Separator - draw a separator"
 msgstr ""
 
 #: ../data/MultiheadSetupDialog.ui.h:1
@@ -518,7 +518,7 @@
 msgstr ""
 
 #: ../data/MultiheadSetupDialog.ui.h:3
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:69
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:93
 msgctxt "option|multihead"
 msgid "Use default value"
 msgstr ""
@@ -575,11 +575,11 @@
 "You need to configure it by yourself.</i>"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:117
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:129
 msgid "No permissions to save configuration"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:119
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:131
 #, python-brace-format
 msgid ""
 "It seems that you don't have permissions to write to file:\n"
@@ -588,153 +588,364 @@
 "Try to run this program using \"sudo\" or \"pkexec\""
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:136
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:148
 #, python-brace-format
 msgid "Failed to read configuration file: {path}"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:206
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:260
+msgid "<i>disabled</i>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:262
+msgid "<i>empty string</i>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:264
+msgid "<i>None</i>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:285
+#, python-brace-format
+msgid "Reset to initial value: <b>{value}</b>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:296
+#, python-brace-format
+msgid "Reset to default value: <b>{value}</b>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:315
 #, python-brace-format
 msgctxt "option|greeter|screensaver-timeout"
 msgid "{count} min"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:191
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:358
+msgctxt "option|greeter|theme-name"
+msgid "Selected theme is not available"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:371
+msgctxt "option|greeter|icon-theme-name"
+msgid "Selected theme is not available"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:378
+msgctxt "option|greeter|allow-debugging"
+msgid "GtkInspector is not available on your system"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py:407
+msgid "Do not leave this field empty"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:150
+#, python-brace-format
+msgid "File not found: {path}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:174
+#, python-brace-format
+msgid "Failed to check permissions: {error}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:177
+#, python-brace-format
+msgid "Directory is not readable: {path}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:180
+#: ../lightdm_gtk_greeter_settings/helpers.py:183
+#: ../lightdm_gtk_greeter_settings/helpers.py:185
+#, python-brace-format
+msgid "LightDM do not have permissions to read path: {path}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:191
+#, python-brace-format
+msgid "Path is not a regular file: {path}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/helpers.py:197
+#: ../lightdm_gtk_greeter_settings/helpers.py:201
+#: ../lightdm_gtk_greeter_settings/helpers.py:204
+#, python-brace-format
+msgid "LightDM do not have permissions to execute file: {path}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:200
 msgctxt "icon-dialog"
 msgid "All contexts"
 msgstr ""
 
 #. separator
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:193
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:202
 msgctxt "icon-dialog"
 msgid "Actions"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:194
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:203
 msgctxt "icon-dialog"
 msgid "Applications"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:195
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:204
 msgctxt "icon-dialog"
 msgid "Categories"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:196
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:205
 msgctxt "icon-dialog"
 msgid "Devices"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:197
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:206
 msgctxt "icon-dialog"
 msgid "Emblems"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:198
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:207
 msgctxt "icon-dialog"
 msgid "Emoticons"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:199
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:208
 msgctxt "icon-dialog"
 msgid "International"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:200
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:209
 msgctxt "icon-dialog"
 msgid "MIME Types"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:201
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:210
 msgctxt "icon-dialog"
 msgid "Places"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:202
+#: ../lightdm_gtk_greeter_settings/IconChooserDialog.py:211
 msgctxt "icon-dialog"
 msgid "Status"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:75
-#, python-brace-format
-msgctxt "option|multihead"
-msgid "Available monitors: <i>{monitors}</i>"
-msgstr ""
-
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:187
+#: ../lightdm_gtk_greeter_settings/IndicatorPropertiesDialog.py:71
+msgctxt "option-entry|indicators"
+msgid "<b>Using default value</b>"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorPropertiesDialog.py:77
+msgctxt "option-entry|indicators"
+msgid "Use default value..."
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorPropertiesDialog.py:233
+msgctxt "option-entry|indicators"
+msgid "Path/Service field is not filled"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorPropertiesDialog.py:237
+#, python-brace-format
+msgctxt "option-entry|indicators"
+msgid ""
+"Indicator \"{name}\" is already in the list.\n"
+"It will be overwritten."
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:131
+msgctxt "option-entry|indicators|name"
+msgid "External library/service"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:132
+msgctxt "option-entry|indicators|name"
+msgid "Spacer"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:133
+msgctxt "option-entry|indicators|name"
+msgid "Separator"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:134
+msgctxt "option-entry|indicators|name"
+msgid "Text"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:135
+msgctxt "option-entry|indicators|name"
+msgid "Clock"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:136
+msgctxt "option-entry|indicators|name"
+msgid "Host name"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:137
+msgctxt "option-entry|indicators|name"
+msgid "Keyboard layout"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:138
+msgctxt "option-entry|indicators|name"
+msgid "Sessions menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:139
+msgctxt "option-entry|indicators|name"
+msgid "Languages menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:140
+msgctxt "option-entry|indicators|name"
+msgid "Accessibility menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:141
+msgctxt "option-entry|indicators|name"
+msgid "Power menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:148
+msgctxt "option-entry|indicators|tooltip"
+msgid "Spacer"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:149
+msgctxt "option-entry|indicators|tooltip"
+msgid "Separator"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:150
+msgctxt "option-entry|indicators|tooltip"
+msgid "Custom text or/and image"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:151
+msgctxt "option-entry|indicators|tooltip"
+msgid "Host name"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:152
+msgctxt "option-entry|indicators|tooltip"
+msgid "Clock"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:153
+msgctxt "option-entry|indicators|tooltip"
+msgid "Layout indicator"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:155
+msgctxt "option-entry|indicators|tooltip"
+msgid "Sessions menu (xfce, unity, gnome etc.)"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:156
+msgctxt "option-entry|indicators|tooltip"
+msgid "Languages menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:157
+msgctxt "option-entry|indicators|tooltip"
+msgid "Accessibility menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:158
+msgctxt "option-entry|indicators|tooltip"
+msgid "Power menu"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:581
+msgctxt "option-entry|indicators"
+msgid "Reset to _defaults"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:583
+msgctxt "option-entry|indicators"
+msgid "Display _label"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:585
+msgctxt "option-entry|indicators"
+msgid "Display _image"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:587
+msgctxt "option-entry|indicators"
+msgid "_Remove"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:687
+msgctxt "option-entry|indicators"
+msgid "Show unused items"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/IndicatorsEntry.py:691
+msgctxt "option-entry|indicators"
+msgid "Predefined templates:"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:109
+#, python-brace-format
+msgctxt "option|multihead"
+msgid "Available monitors: {monitors}"
+msgstr ""
+
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:239
 msgctxt "option|multihead"
 msgid "Select background file"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:217
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:272
 #, python-brace-format
 msgctxt "option|multihead"
 msgid "Invalid name: \"{name}\""
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:220
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:275
 msgctxt "option|multihead"
 msgid "This name already in use."
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:222
+#: ../lightdm_gtk_greeter_settings/MultiheadSetupDialog.py:277
 msgctxt "option|multihead"
 msgid "This name is not valid."
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:206
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:252
 msgctxt "option|StringPathEntry"
 msgid "Select path"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:372
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:426
 #, python-brace-format
 msgctxt "option-entry|icon"
 msgid "<b>Icon: {icon}</b>"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:377
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:431
 msgctxt "option-entry|icon"
 msgid "Select icon name..."
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:381
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:435
 #, python-brace-format
 msgctxt "option-entry|icon"
 msgid "<b>File: {path}</b> (failed to load)"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:383
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:437
 #, python-brace-format
 msgctxt "option-entry|icon"
 msgid "<b>File: {path}</b>"
 msgstr ""
 
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:389
+#: ../lightdm_gtk_greeter_settings/OptionEntry.py:443
 msgctxt "option-entry|icon"
 msgid "Select file..."
-msgstr ""
-
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:442
-msgctxt "option-entry|indicators"
-msgid "Spacer"
-msgstr ""
-
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:443
-msgctxt "option-entry|indicators"
-msgid "Separator"
-msgstr ""
-
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:525
-#, python-brace-format
-msgctxt "option-entry|indicators"
-msgid "Indicator \"{indicator}\" is already in the list"
-msgstr ""
-
-#: ../lightdm_gtk_greeter_settings/OptionEntry.py:537
-#, python-brace-format
-msgctxt "option-entry|indicators"
-msgid "Indicator: {name}"
 msgstr ""
 
 #: ../com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy.in.h:1