diff --git a/MANIFEST b/MANIFEST
index 435dd11..6d02035 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,5 @@
 include lightdm-gtk-greeter-settings.desktop.in README COPYING
+include com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy
 include bin/*
 recursive-include data *.ui *.xml
 recursive-include lightdm_gtk_greeter_settings *.py
diff --git a/bin/lightdm-gtk-greeter-settings-pkexec b/bin/lightdm-gtk-greeter-settings-pkexec
new file mode 100755
index 0000000..577c273
--- /dev/null
+++ b/bin/lightdm-gtk-greeter-settings-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/lightdm-gtk-greeter-settings" "$@"
diff --git a/com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy b/com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy
new file mode 100644
index 0000000..40bd4ca
--- /dev/null
+++ b/com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="com.ubuntu.pkexec.mytest">
+    <message>Authentication is required to run Settings editor for LightDM GTK+ Greeter</message>
+    <icon_name>preferences-system</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/lightdm-gtk-greeter-settings</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/data/GtkGreeterSettingsWindow.ui b/data/GtkGreeterSettingsWindow.ui
index 7462e4f..1fe1830 100644
--- a/data/GtkGreeterSettingsWindow.ui
+++ b/data/GtkGreeterSettingsWindow.ui
@@ -2,20 +2,44 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires gtk_greeter_settings 1.0 -->
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="icon_cancel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">2</property>
+    <property name="icon_name">dialog-cancel</property>
+  </object>
+  <object class="GtkImage" id="icon_close">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">2</property>
+    <property name="icon_name">dialog-close</property>
+  </object>
+  <object class="GtkImage" id="icon_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="icon_name">image</property>
   </object>
-  <object class="GtkImage" id="image2">
+  <object class="GtkImage" id="icon_ok">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-ok</property>
+  </object>
+  <object class="GtkImage" id="icon_open">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="icon_name">document-open</property>
   </object>
-  <object class="GtkImage" id="image3">
+  <object class="GtkImage" id="icon_reset">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="xpad">2</property>
     <property name="icon_name">reload</property>
+  </object>
+  <object class="GtkImage" id="icon_save">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">2</property>
+    <property name="icon_name">document-save</property>
   </object>
   <object class="GtkListStore" id="indicators_model">
     <columns>
@@ -65,15 +89,11 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="timeout_adjustment">
-    <property name="upper">300</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkGreeterSettingsWindow" id="settings_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">LightDM GTK+ Greeter: settings</property>
     <property name="window_position">center</property>
+    <property name="icon_name">preferences-system</property>
     <signal name="destroy" handler="on_destroy" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">
@@ -1279,10 +1299,9 @@
                 <child>
                   <object class="GtkScale" id="timeout_view">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="margin_left">24</property>
                     <property name="adjustment">timeout_adjustment</property>
-                    <property name="lower_stepper_sensitivity">on</property>
                     <property name="fill_level">10000</property>
                     <property name="round_digits">1</property>
                     <property name="digits">0</property>
@@ -1328,11 +1347,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="apply_button">
-                <property name="label">gtk-save</property>
+                <property name="label">Save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">icon_save</property>
                 <signal name="clicked" handler="on_apply_clicked" swapped="no"/>
               </object>
               <packing>
@@ -1343,11 +1362,11 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+                <property name="label">Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">icon_close</property>
                 <signal name="clicked" handler="on_close_clicked" swapped="no"/>
               </object>
               <packing>
@@ -1362,7 +1381,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">image3</property>
+                <property name="image">icon_reset</property>
                 <signal name="clicked" handler="on_reset_clicked" swapped="no"/>
               </object>
               <packing>
@@ -1382,6 +1401,11 @@
       </object>
     </child>
   </object>
+  <object class="GtkAdjustment" id="timeout_adjustment">
+    <property name="upper">300</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkMenu" id="userimage_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1390,7 +1414,7 @@
         <property name="label">Icon</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="image">image1</property>
+        <property name="image">icon_image</property>
         <property name="use_stock">False</property>
       </object>
     </child>
@@ -1399,7 +1423,7 @@
         <property name="label">Path</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="image">image2</property>
+        <property name="image">icon_open</property>
         <property name="use_stock">False</property>
       </object>
     </child>
@@ -1440,11 +1464,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">icon_cancel</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1454,13 +1479,14 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-ok</property>
+                <property name="label">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">icon_ok</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
index 8da26ee..af8badd 100644
--- a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
+++ b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
@@ -159,7 +159,11 @@
         self._apply_button.props.sensitive = self._allow_edit and self._changed_values
 
     def on_format_time_scale(self, scale, value):
-        return '%02d:%02d' % (value // 60, value % 60)
+        value = int(value)
+        if value > 0:
+            return '%02d:%02d' % (value // 60, value % 60)
+        else:
+            return _('Never')
 
     def on_destroy(self, *args):
         Gtk.main_quit()
diff --git a/setup.py b/setup.py
index b838d69..d34eaca 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
         for k, v in values.items():
             f.write('%s = %s\n' % (k, v))
     except OSError as e:
-            print ("ERROR: Can't write installation_config: %s" % e)
+            print ("ERROR: Can't write installation config: %s" % e)
             sys.exit(1)
 
 
@@ -50,6 +50,7 @@
 def update_desktop_file(filename, target_pkgdata, target_scripts):
 
     config = configparser.RawConfigParser(strict=False, allow_no_value=True)
+    config.optionxform = str
     try:
         config.read(filename)
     except configparser.Error as e:
@@ -60,7 +61,7 @@
         config.add_section('Desktop Entry')
     
     old_command = config.get('Desktop Entry', 'Exec', fallback='').split(None, 1)
-    new_command = target_scripts + 'lightdm-gtk-greeter-settings'
+    new_command = target_scripts + 'lightdm-gtk-greeter-settings-pkexec'
     if len(old_command) > 1:
         new_command += ' ' + new_command[1]
     config.set('Desktop Entry', 'Exec', new_command)
@@ -86,15 +87,21 @@
         update_desktop_file(desktop_file, target_pkgdata, target_scripts)
 
 
-DistUtilsExtra.auto.setup(
+DistUtilsExtra.auto.setup \
+(
     name='lightdm-gtk-greeter-settings',
-    version='0.1',
+    version='0.3',
     license='GPL-3',
     author='Andrew P.',
     author_email='pan.pav.7c5@gmail.com',
     description='Settings editor for LightDM GTK+ Greeter',
     long_description='Settings editor for LightDM GTK+ Greeter',
     url='https://launchpad.net/lightdm-gtk-greeter-settings',
-    cmdclass={'install': InstallAndUpdateDataDirectory}
-    )
+    cmdclass={'install': InstallAndUpdateDataDirectory},
+    data_files=\
+    [
+        (os.path.join('share', 'polkit-1', 'actions'),
+            ['com.ubuntu.pkexec.lightdm-gtk-greeter-settings.policy'])
+    ],
+)