diff --git a/locale/ubl-settings-services.pot b/locale/ubl-settings-services.pot
index 636c2d4..3a2528d 100644
--- a/locale/ubl-settings-services.pot
+++ b/locale/ubl-settings-services.pot
@@ -523,6 +523,46 @@ msgstr ""
 msgid "abandoned"
 msgstr ""
 
+#: source/ubl-strings.h:149 source/ubl-settings-services-systemd.c:93
+msgid "Disabled"
+msgstr ""
+
+#: source/ubl-strings.h:150
+msgid "Active"
+msgstr ""
+
+#: source/ubl-strings.h:151
+msgid "Dead"
+msgstr ""
+
+#: source/ubl-strings.h:152
+msgid "Waiting"
+msgstr ""
+
+#: source/ubl-strings.h:153
+msgid "Running"
+msgstr ""
+
+#: source/ubl-strings.h:154
+msgid "Listening"
+msgstr ""
+
+#: source/ubl-strings.h:155
+msgid "Exited"
+msgstr ""
+
+#: source/ubl-strings.h:156
+msgid "Mounted"
+msgstr ""
+
+#: source/ubl-strings.h:157
+msgid "Plugged"
+msgstr ""
+
+#: source/ubl-strings.h:158
+msgid "Abandoned"
+msgstr ""
+
 #: source/ubl-strings.h:160
 msgid "State of "
 msgstr ""
@@ -567,10 +607,6 @@ msgstr ""
 msgid "Null"
 msgstr ""
 
-#: source/ubl-strings.h:175 source/ubl-strings.h:180
-msgid "Unit file:"
-msgstr ""
-
 #: source/ubl-strings.h:176
 msgid "Unit file state:"
 msgstr ""
@@ -602,3 +638,19 @@ msgstr ""
 #: source/ubl-strings.h:180
 msgid "masked"
 msgstr ""
+
+#: source/ubl-strings.h:180
+msgid "Loaded"
+msgstr ""
+
+#: source/ubl-strings.h:180
+msgid "Inactive"
+msgstr ""
+
+#: source/ubl-strings.h:180
+msgid "Not-found"
+msgstr ""
+
+#: source/ubl-strings.h:180
+msgid "Masked"
+msgstr ""
diff --git a/locale/ubl-settings-services_ru.po b/locale/ubl-settings-services_ru.po
index 76f823d..30330ff 100644
--- a/locale/ubl-settings-services_ru.po
+++ b/locale/ubl-settings-services_ru.po
@@ -323,12 +323,12 @@ msgid "Seconds"
 msgstr "Секунд"
 
 #: source/ubl-strings.h:96
-msgid "Active"
-msgstr "Активна"
+#msgid "Active"
+#msgstr "Активна"
 
 #: source/ubl-strings.h:97
-msgid "Inactive"
-msgstr "Неактивна"
+#msgid "Inactive"
+#msgstr "Неактивна"
 
 #: source/ubl-strings.h:99
 msgid "System units"
@@ -526,6 +526,46 @@ msgstr "подключен"
 msgid "abandoned"
 msgstr "заброшен"
 
+#: source/ubl-strings.h:149 source/ubl-settings-services-systemd.c:93
+msgid "Disabled"
+msgstr "Неактивен"
+
+#: source/ubl-strings.h:150
+msgid "Active"
+msgstr "Активен"
+
+#: source/ubl-strings.h:151
+msgid "Dead"
+msgstr "Остановлен"
+
+#: source/ubl-strings.h:152
+msgid "Waiting"
+msgstr "Ожидание"
+
+#: source/ubl-strings.h:153
+msgid "Running"
+msgstr "Работает"
+
+#: source/ubl-strings.h:154
+msgid "Listening"
+msgstr "Прослушивание"
+
+#: source/ubl-strings.h:155
+msgid "Exited"
+msgstr "Завершён"
+
+#: source/ubl-strings.h:156
+msgid "Mounted"
+msgstr "Примонтирован"
+
+#: source/ubl-strings.h:157
+msgid "Plugged"
+msgstr "Подключен"
+
+#: source/ubl-strings.h:158
+msgid "Abandoned"
+msgstr "Заброшен"
+
 #: source/ubl-strings.h:160
 msgid "State of "
 msgstr "Состояние "
@@ -571,8 +611,12 @@ msgid "Null"
 msgstr "Нет данных"
 
 #: source/ubl-strings.h:175 source/ubl-strings.h:180
-msgid "Unit file:"
-msgstr "Юнит-файл:"
+msgid "File:"
+msgstr "Файл:"
+
+#: source/ubl-strings.h:175 source/ubl-strings.h:180
+msgid "Autostart:"
+msgstr "Автозапуск:"
 
 #: source/ubl-strings.h:176
 msgid "Unit file state:"
@@ -680,4 +724,20 @@ msgstr "вылючен"
 
 #: source/ubl-strings.h:180
 msgid "masked"
-msgstr "выключен"
\ No newline at end of file
+msgstr "выключен"
+
+#: source/ubl-strings.h:180
+msgid "Loaded"
+msgstr "Включен"
+
+#: source/ubl-strings.h:180
+msgid "Inactive"
+msgstr "Неактивен"
+
+#: source/ubl-strings.h:180
+msgid "Not-found"
+msgstr "Вылючен"
+
+#: source/ubl-strings.h:180
+msgid "Masked"
+msgstr "Выключен"
\ No newline at end of file
diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 8f905e9..c0e100a 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -1799,7 +1799,7 @@ gboolean on_tooltip_show(GtkWidget*, gint x, gint y, gboolean, GtkTooltip* toolt
         if (gtk_tree_model_get_iter(model, &iter, path)) {
             gchar *name, *description, *state, *name_target, *load_status, *active_status,*unit_path;
             int size;
-            gtk_tree_model_get(model, &iter, 5, &name, 6, &description, 11, &state, 14,&load_status,15,&active_status,16,&unit_path, -1);
+            gtk_tree_model_get(model, &iter, 5, &name, 6, &description, 13, &state, 14,&load_status,15,&active_status,16,&unit_path, -1);
             name_target = yon_char_new(name);
             if (name[0]=='-'){
                 name_target = yon_char_append("-- ",name_target);
@@ -1815,11 +1815,13 @@ gboolean on_tooltip_show(GtkWidget*, gint x, gint y, gboolean, GtkTooltip* toolt
                 yon_char_remove_last_symbol(target[2], '\n');
             }
             
-            
+            state[0]=g_ascii_toupper(state[0]);
+            load_status[0]=g_ascii_toupper(load_status[0]);
+            active_status[0]=g_ascii_toupper(active_status[0]);
             gtk_label_set_text(GTK_LABEL(widgets->UnitLabel), unit_path);
-            gtk_label_set_text(GTK_LABEL(widgets->NameLabel), name);
+            gtk_label_set_markup(GTK_LABEL(widgets->NameLabel), yon_char_unite("<b>",name,"</b>",NULL));
             gtk_label_set_text(GTK_LABEL(widgets->DescriptionLabel), description);
-            gtk_label_set_text(GTK_LABEL(widgets->StatusQueryLabel), state);
+            gtk_label_set_text(GTK_LABEL(widgets->StatusQueryLabel), _(state));
             gtk_label_set_text(GTK_LABEL(widgets->AutostartLabel), _(load_status));
             gtk_label_set_text(GTK_LABEL(widgets->TooltipStatusLabel), _(active_status));
             
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 45c3a81..011ffeb 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -172,7 +172,7 @@
 
 #define SAVE_LABEL _("Save")
 #define NULL_LABEL _("Null")
-#define UNIT_FILE_LABEL _("Unit file:")
+#define UNIT_FILE_LABEL _("File:")
 #define UNIT_STATE_LABEL _("Unit file state:")
 #define ACTIVATED_LABEL _("Activated:")
 #define DEACTIVATED_LABEL _("Deactivated:")
@@ -181,4 +181,15 @@
 #define LOADED_STATUS_LABEL _("loaded")
 #define INACTIVE_STATUS_LABEL _("inactive")
 #define NOT_FOUND_STATUS_LABEL _("not-found")
-#define MASKED_STATUS_LABEL _("masked")
\ No newline at end of file
+#define MASKED_STATUS_LABEL _("masked")
+#define STATE_DISABLED_TOOLTIP_LABEL _("Disabled")
+#define STATE_ACTIVE_TOOLTIP_LABEL _("Active")
+#define STATE_DEAD_TOOLTIP_LABEL _("Dead")
+#define STATE_WAITING_TOOLTIP_LABEL _("Waiting")
+#define STATE_RUNNING_TOOLTIP_LABEL _("Running")
+#define STATE_LISTENING_TOOLTIP_LABEL _("Listening")
+#define STATE_EXITED_TOOLTIP_LABEL _("Exited")
+#define STATE_MOUNTED_TOOLTIP_LABEL _("Mounted")
+#define STATE_PLUGGED_TOOLTIP_LABEL _("Plugged")
+#define STATE_ABANDONED_TOOLTIP_LABEL _("Abandoned")
+#define AUTOSTART_STATUS_TOOLTIP_LABEL _("Autostart:")
\ No newline at end of file
diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index 416e8a8..7c5916a 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-services">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-services.css -->
@@ -117,23 +117,12 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Service:</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkLabel" id="NameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">Service:</property>
+            <property name="use-markup">True</property>
             <property name="single-line-mode">True</property>
             <property name="xalign">0</property>
           </object>
@@ -325,7 +314,7 @@
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Unit file:</property>
+            <property name="label" translatable="yes">File:</property>
           </object>
           <packing>
             <property name="expand">False</property>