diff --git a/lib/NGCP/Panel/I18N/de.po b/lib/NGCP/Panel/I18N/de.po
index 5cba9be55a..826b339ef7 100644
--- a/lib/NGCP/Panel/I18N/de.po
+++ b/lib/NGCP/Panel/I18N/de.po
@@ -1991,10 +1991,6 @@ msgstr "Kunde nicht gefunden"
 msgid "Customers"
 msgstr "Kunden"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Customize.."
-msgstr ""
-
 #: share/templates/widgets/admin_topmenu_settings.tt
 msgid "DB Statistics"
 msgstr ""
@@ -2422,7 +2418,7 @@ msgstr ""
 
 #: share/templates/customer/details.tt share/templates/device/list.tt
 #: share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt
-#: share/templates/subscriber/preferences.tt share/templates/timeset/list.tt
+#: share/templates/subscriber/preferences.tt
 msgid "Download"
 msgstr "Runterladen"
 
@@ -2445,6 +2441,10 @@ msgstr "PCAP runterladen"
 msgid "Download as CSV"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "Download iCalendar"
+msgstr ""
+
 #: share/templates/billing/list.tt
 msgid "Duplicate"
 msgstr ""
@@ -2734,10 +2734,6 @@ msgstr "Ende"
 msgid "End Date"
 msgstr "End-Datum"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Endless event"
-msgstr ""
-
 #: lib/NGCP/Panel/Controller/Subscriber.pm
 msgid ""
 "Error while sending fax (have the fax settings been configured properly?)"
@@ -5674,6 +5670,7 @@ msgid "No such voicemail file."
 msgstr "Sprachnachricht nicht gefunden."
 
 #: share/templates/customer/details.tt
+#: share/templates/timeset/switch_end_control.tt
 msgid "None"
 msgstr ""
 
@@ -6883,7 +6880,8 @@ msgstr ""
 msgid "Rule"
 msgstr "Regel"
 
-#: share/templates/header/set_list.tt share/templates/rewrite/set_list.tt
+#: lib/NGCP/Panel/Controller/TimeSet.pm share/templates/header/set_list.tt
+#: share/templates/rewrite/set_list.tt
 msgid "Rules"
 msgstr "Regeln"
 
@@ -7203,6 +7201,10 @@ msgstr "Session-Timer Refresh-Intervall"
 msgid "Session-Timer Refresh Method"
 msgstr "Session-Timer Refresh-Methode"
 
+#: share/templates/timeset/switch_end_control.tt
+msgid "Set"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "Set Cash Balance"
 msgstr ""
@@ -8299,10 +8301,6 @@ msgstr "Zeit"
 msgid "Time Set"
 msgstr "Zeit-Set"
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "Time Set #"
-msgstr ""
-
 #: share/templates/timeset/event_list.tt
 msgid "Time Set Event"
 msgstr ""
@@ -8312,6 +8310,11 @@ msgstr ""
 msgid "Time Sets"
 msgstr "Zeit-Sets"
 
+#. (timeset.name)
+#: share/templates/timeset/event_list.tt
+msgid "Time set \"%1\" - Events"
+msgstr ""
+
 #: share/templates/reseller/details.tt
 msgid "Time sets"
 msgstr ""
@@ -8920,6 +8923,10 @@ msgstr ""
 msgid "any number"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "at"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "billing profile default"
 msgstr "Verrechnungs-Profil Standard"
@@ -9001,6 +9008,10 @@ msgstr ""
 msgid "foreign calls"
 msgstr "fremde Anrufe"
 
+#: share/templates/timeset/event_list.tt
+msgid "from"
+msgstr ""
+
 #: share/templates/subscriber/preferences.tt
 msgid "from_email"
 msgstr ""
@@ -9021,10 +9032,6 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "iCal"
-msgstr ""
-
 #: share/templates/subscriber/webphone.tt
 msgid "in progress..."
 msgstr "es läutet..."
@@ -9131,6 +9138,7 @@ msgid "time of incident:"
 msgstr "Zeitpunkt des Vorfalls:"
 
 #: share/templates/subscriber/preferences.tt
+#: share/templates/timeset/event_list.tt
 msgid "to"
 msgstr ""
 
diff --git a/lib/NGCP/Panel/I18N/es.po b/lib/NGCP/Panel/I18N/es.po
index eebf1b2f9a..20aa236734 100644
--- a/lib/NGCP/Panel/I18N/es.po
+++ b/lib/NGCP/Panel/I18N/es.po
@@ -1985,10 +1985,6 @@ msgstr "Cliente no encontrado"
 msgid "Customers"
 msgstr "Clientes"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Customize.."
-msgstr ""
-
 #: share/templates/widgets/admin_topmenu_settings.tt
 msgid "DB Statistics"
 msgstr ""
@@ -2415,7 +2411,7 @@ msgstr ""
 
 #: share/templates/customer/details.tt share/templates/device/list.tt
 #: share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt
-#: share/templates/subscriber/preferences.tt share/templates/timeset/list.tt
+#: share/templates/subscriber/preferences.tt
 msgid "Download"
 msgstr "Descargar"
 
@@ -2438,6 +2434,10 @@ msgstr "Descargar PCAP"
 msgid "Download as CSV"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "Download iCalendar"
+msgstr ""
+
 #: share/templates/billing/list.tt
 msgid "Duplicate"
 msgstr ""
@@ -2728,10 +2728,6 @@ msgstr "Fin"
 msgid "End Date"
 msgstr "Fecha de finalización"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Endless event"
-msgstr ""
-
 #: lib/NGCP/Panel/Controller/Subscriber.pm
 msgid ""
 "Error while sending fax (have the fax settings been configured properly?)"
@@ -5668,6 +5664,7 @@ msgid "No such voicemail file."
 msgstr "No existe el fichero de mensaje de buzón"
 
 #: share/templates/customer/details.tt
+#: share/templates/timeset/switch_end_control.tt
 msgid "None"
 msgstr ""
 
@@ -6879,7 +6876,8 @@ msgstr ""
 msgid "Rule"
 msgstr "Regla"
 
-#: share/templates/header/set_list.tt share/templates/rewrite/set_list.tt
+#: lib/NGCP/Panel/Controller/TimeSet.pm share/templates/header/set_list.tt
+#: share/templates/rewrite/set_list.tt
 msgid "Rules"
 msgstr "Reglas"
 
@@ -7213,6 +7211,10 @@ msgstr "Session-Timer Refresh Interval"
 msgid "Session-Timer Refresh Method"
 msgstr "Session-Timer Refresh Method"
 
+#: share/templates/timeset/switch_end_control.tt
+msgid "Set"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "Set Cash Balance"
 msgstr ""
@@ -8298,10 +8300,6 @@ msgstr "Tiempo"
 msgid "Time Set"
 msgstr "Grupo de Tiempos"
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "Time Set #"
-msgstr ""
-
 #: share/templates/timeset/event_list.tt
 msgid "Time Set Event"
 msgstr ""
@@ -8311,6 +8309,11 @@ msgstr ""
 msgid "Time Sets"
 msgstr "Grupos de Tiempos"
 
+#. (timeset.name)
+#: share/templates/timeset/event_list.tt
+msgid "Time set \"%1\" - Events"
+msgstr ""
+
 #: share/templates/reseller/details.tt
 msgid "Time sets"
 msgstr ""
@@ -8922,6 +8925,10 @@ msgstr "cualquiera"
 msgid "any number"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "at"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "billing profile default"
 msgstr "perfil de facturación por defecto"
@@ -9003,6 +9010,10 @@ msgstr ""
 msgid "foreign calls"
 msgstr "llamadas externas"
 
+#: share/templates/timeset/event_list.tt
+msgid "from"
+msgstr ""
+
 #: share/templates/subscriber/preferences.tt
 msgid "from_email"
 msgstr ""
@@ -9023,10 +9034,6 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "iCal"
-msgstr ""
-
 #: share/templates/subscriber/webphone.tt
 msgid "in progress..."
 msgstr "en progreso..."
@@ -9133,6 +9140,7 @@ msgid "time of incident:"
 msgstr "fecha del incidente:"
 
 #: share/templates/subscriber/preferences.tt
+#: share/templates/timeset/event_list.tt
 msgid "to"
 msgstr ""
 
diff --git a/lib/NGCP/Panel/I18N/it.po b/lib/NGCP/Panel/I18N/it.po
index 26e2ac7bbb..904fd67d8d 100644
--- a/lib/NGCP/Panel/I18N/it.po
+++ b/lib/NGCP/Panel/I18N/it.po
@@ -2054,10 +2054,6 @@ msgstr "Cliente non è stato trovato"
 msgid "Customers"
 msgstr "Clienti"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Customize.."
-msgstr ""
-
 #: share/templates/widgets/admin_topmenu_settings.tt
 msgid "DB Statistics"
 msgstr ""
@@ -2497,7 +2493,7 @@ msgstr "Giù"
 
 #: share/templates/customer/details.tt share/templates/device/list.tt
 #: share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt
-#: share/templates/subscriber/preferences.tt share/templates/timeset/list.tt
+#: share/templates/subscriber/preferences.tt
 msgid "Download"
 msgstr "Scarica"
 
@@ -2520,6 +2516,10 @@ msgstr "Scarica PCAP"
 msgid "Download as CSV"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "Download iCalendar"
+msgstr ""
+
 #: share/templates/billing/list.tt
 msgid "Duplicate"
 msgstr "Duplica"
@@ -2813,10 +2813,6 @@ msgstr "Fine"
 msgid "End Date"
 msgstr "Data di Fine"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Endless event"
-msgstr ""
-
 #: lib/NGCP/Panel/Controller/Subscriber.pm
 msgid ""
 "Error while sending fax (have the fax settings been configured properly?)"
@@ -5807,6 +5803,7 @@ msgid "No such voicemail file."
 msgstr "Nessun file casella vocale."
 
 #: share/templates/customer/details.tt
+#: share/templates/timeset/switch_end_control.tt
 msgid "None"
 msgstr "Nessuno"
 
@@ -7024,7 +7021,8 @@ msgstr "Numero Chiamabile"
 msgid "Rule"
 msgstr "Regola"
 
-#: share/templates/header/set_list.tt share/templates/rewrite/set_list.tt
+#: lib/NGCP/Panel/Controller/TimeSet.pm share/templates/header/set_list.tt
+#: share/templates/rewrite/set_list.tt
 msgid "Rules"
 msgstr "Regole"
 
@@ -7353,6 +7351,10 @@ msgstr "Intervallo di Refresh Session-Timer"
 msgid "Session-Timer Refresh Method"
 msgstr "Metodo di Refresh Session-Timer"
 
+#: share/templates/timeset/switch_end_control.tt
+msgid "Set"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "Set Cash Balance"
 msgstr "Definisci Accredito Conto"
@@ -8469,10 +8471,6 @@ msgstr "Orario"
 msgid "Time Set"
 msgstr "Set Temporale"
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "Time Set #"
-msgstr ""
-
 #: share/templates/timeset/event_list.tt
 msgid "Time Set Event"
 msgstr ""
@@ -8482,6 +8480,11 @@ msgstr ""
 msgid "Time Sets"
 msgstr "Set Temporali"
 
+#. (timeset.name)
+#: share/templates/timeset/event_list.tt
+msgid "Time set \"%1\" - Events"
+msgstr ""
+
 #: share/templates/reseller/details.tt
 msgid "Time sets"
 msgstr ""
@@ -9102,6 +9105,10 @@ msgstr "qualsiasi"
 msgid "any number"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "at"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "billing profile default"
 msgstr "profilo fatturazione di default"
@@ -9183,6 +9190,10 @@ msgstr ""
 msgid "foreign calls"
 msgstr "chiamate esterne"
 
+#: share/templates/timeset/event_list.tt
+msgid "from"
+msgstr ""
+
 #: share/templates/subscriber/preferences.tt
 msgid "from_email"
 msgstr "from_email"
@@ -9203,10 +9214,6 @@ msgstr "ora"
 msgid "hours"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "iCal"
-msgstr ""
-
 #: share/templates/subscriber/webphone.tt
 msgid "in progress..."
 msgstr "in corso..."
@@ -9317,6 +9324,7 @@ msgid "time of incident:"
 msgstr "orario incidente:"
 
 #: share/templates/subscriber/preferences.tt
+#: share/templates/timeset/event_list.tt
 msgid "to"
 msgstr "a"
 
diff --git a/lib/NGCP/Panel/I18N/messages.pot b/lib/NGCP/Panel/I18N/messages.pot
index 8b7d089992..363758440f 100644
--- a/lib/NGCP/Panel/I18N/messages.pot
+++ b/lib/NGCP/Panel/I18N/messages.pot
@@ -1681,10 +1681,6 @@ msgstr ""
 msgid "Customers"
 msgstr ""
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Customize.."
-msgstr ""
-
 #: share/templates/widgets/admin_topmenu_settings.tt
 msgid "DB Statistics"
 msgstr ""
@@ -2029,7 +2025,7 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: share/templates/customer/details.tt share/templates/device/list.tt share/templates/device/list.tt share/templates/invoice/invoice_list.tt share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt share/templates/subscriber/preferences.tt share/templates/timeset/list.tt
+#: share/templates/customer/details.tt share/templates/device/list.tt share/templates/device/list.tt share/templates/invoice/invoice_list.tt share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt share/templates/subscriber/preferences.tt
 msgid "Download"
 msgstr ""
 
@@ -2049,6 +2045,10 @@ msgstr ""
 msgid "Download as CSV"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "Download iCalendar"
+msgstr ""
+
 #: share/templates/billing/list.tt
 msgid "Duplicate"
 msgstr ""
@@ -2295,10 +2295,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Endless event"
-msgstr ""
-
 #: lib/NGCP/Panel/Controller/Subscriber.pm
 msgid "Error while sending fax (have the fax settings been configured properly?)"
 msgstr ""
@@ -5068,7 +5064,7 @@ msgstr ""
 msgid "No such voicemail file."
 msgstr ""
 
-#: share/templates/customer/details.tt
+#: share/templates/customer/details.tt share/templates/timeset/switch_end_control.tt
 msgid "None"
 msgstr ""
 
@@ -6191,7 +6187,7 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
-#: share/templates/header/set_list.tt share/templates/header/set_list.tt share/templates/rewrite/set_list.tt share/templates/rewrite/set_list.tt
+#: lib/NGCP/Panel/Controller/TimeSet.pm share/templates/header/set_list.tt share/templates/header/set_list.tt share/templates/rewrite/set_list.tt share/templates/rewrite/set_list.tt
 msgid "Rules"
 msgstr ""
 
@@ -6428,6 +6424,10 @@ msgstr ""
 msgid "Session-Timer Refresh Method"
 msgstr ""
 
+#: share/templates/timeset/switch_end_control.tt
+msgid "Set"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "Set Cash Balance"
 msgstr ""
@@ -7313,11 +7313,7 @@ msgstr ""
 msgid "Time Set"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "Time Set #"
-msgstr ""
-
-#: share/templates/timeset/event_list.tt share/templates/timeset/event_list.tt
+#: share/templates/timeset/event_list.tt
 msgid "Time Set Event"
 msgstr ""
 
@@ -7325,6 +7321,11 @@ msgstr ""
 msgid "Time Sets"
 msgstr ""
 
+#. (timeset.name)
+#: share/templates/timeset/event_list.tt
+msgid "Time set \"%1\" - Events"
+msgstr ""
+
 #: share/templates/reseller/details.tt share/templates/reseller/details.tt
 msgid "Time sets"
 msgstr ""
@@ -7889,6 +7890,10 @@ msgstr ""
 msgid "any number"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "at"
+msgstr ""
+
 #: share/templates/customer/details.tt share/templates/customer/details.tt
 msgid "billing profile default"
 msgstr ""
@@ -7969,6 +7974,10 @@ msgstr ""
 msgid "foreign calls"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "from"
+msgstr ""
+
 #: share/templates/subscriber/preferences.tt
 msgid "from_email"
 msgstr ""
@@ -7989,10 +7998,6 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "iCal"
-msgstr ""
-
 #: share/templates/subscriber/webphone.tt
 msgid "in progress..."
 msgstr ""
@@ -8097,7 +8102,7 @@ msgstr ""
 msgid "time of incident:"
 msgstr ""
 
-#: share/templates/subscriber/preferences.tt
+#: share/templates/subscriber/preferences.tt share/templates/timeset/event_list.tt
 msgid "to"
 msgstr ""
 
diff --git a/lib/NGCP/Panel/I18N/ru.po b/lib/NGCP/Panel/I18N/ru.po
index 6c3462799b..424f5022e4 100644
--- a/lib/NGCP/Panel/I18N/ru.po
+++ b/lib/NGCP/Panel/I18N/ru.po
@@ -1993,10 +1993,6 @@ msgstr "Клиент не найден"
 msgid "Customers"
 msgstr "Клиенты"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Customize.."
-msgstr ""
-
 #: share/templates/widgets/admin_topmenu_settings.tt
 msgid "DB Statistics"
 msgstr ""
@@ -2423,7 +2419,7 @@ msgstr ""
 
 #: share/templates/customer/details.tt share/templates/device/list.tt
 #: share/templates/invoice/invoice_list.tt share/templates/reseller/details.tt
-#: share/templates/subscriber/preferences.tt share/templates/timeset/list.tt
+#: share/templates/subscriber/preferences.tt
 msgid "Download"
 msgstr "Скачать"
 
@@ -2446,6 +2442,10 @@ msgstr "Скачать PCAP"
 msgid "Download as CSV"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "Download iCalendar"
+msgstr ""
+
 #: share/templates/billing/list.tt
 msgid "Duplicate"
 msgstr ""
@@ -2735,10 +2735,6 @@ msgstr "Конец"
 msgid "End Date"
 msgstr "Конечная Дата"
 
-#: share/templates/timeset/switch_end_control.tt
-msgid "Endless event"
-msgstr ""
-
 #: lib/NGCP/Panel/Controller/Subscriber.pm
 msgid ""
 "Error while sending fax (have the fax settings been configured properly?)"
@@ -5675,6 +5671,7 @@ msgid "No such voicemail file."
 msgstr "Нету такого файла голосовой почты."
 
 #: share/templates/customer/details.tt
+#: share/templates/timeset/switch_end_control.tt
 msgid "None"
 msgstr ""
 
@@ -6889,7 +6886,8 @@ msgstr ""
 msgid "Rule"
 msgstr "Правило"
 
-#: share/templates/header/set_list.tt share/templates/rewrite/set_list.tt
+#: lib/NGCP/Panel/Controller/TimeSet.pm share/templates/header/set_list.tt
+#: share/templates/rewrite/set_list.tt
 msgid "Rules"
 msgstr "Правила"
 
@@ -7210,6 +7208,10 @@ msgstr "Session-Timer интервал обновления"
 msgid "Session-Timer Refresh Method"
 msgstr "Session-Timer метод обновления"
 
+#: share/templates/timeset/switch_end_control.tt
+msgid "Set"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "Set Cash Balance"
 msgstr ""
@@ -8300,10 +8302,6 @@ msgstr "Время"
 msgid "Time Set"
 msgstr "Период"
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "Time Set #"
-msgstr ""
-
 #: share/templates/timeset/event_list.tt
 msgid "Time Set Event"
 msgstr ""
@@ -8313,6 +8311,11 @@ msgstr ""
 msgid "Time Sets"
 msgstr "Периоды"
 
+#. (timeset.name)
+#: share/templates/timeset/event_list.tt
+msgid "Time set \"%1\" - Events"
+msgstr ""
+
 #: share/templates/reseller/details.tt
 msgid "Time sets"
 msgstr ""
@@ -8923,6 +8926,10 @@ msgstr ""
 msgid "any number"
 msgstr ""
 
+#: share/templates/timeset/event_list.tt
+msgid "at"
+msgstr ""
+
 #: share/templates/customer/details.tt
 msgid "billing profile default"
 msgstr "По-умолчанию из тарифа"
@@ -9004,6 +9011,10 @@ msgstr ""
 msgid "foreign calls"
 msgstr "звонки вне сети"
 
+#: share/templates/timeset/event_list.tt
+msgid "from"
+msgstr ""
+
 #: share/templates/subscriber/preferences.tt
 msgid "from_email"
 msgstr ""
@@ -9024,10 +9035,6 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/TimeSet.pm
-msgid "iCal"
-msgstr ""
-
 #: share/templates/subscriber/webphone.tt
 msgid "in progress..."
 msgstr "Обработка..."
@@ -9134,6 +9141,7 @@ msgid "time of incident:"
 msgstr "время инцидента:"
 
 #: share/templates/subscriber/preferences.tt
+#: share/templates/timeset/event_list.tt
 msgid "to"
 msgstr ""