diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb
index 71fbd47b3..2ae01b869 100644
--- a/app/assets/javascripts/controllers/admin/calendar.js.erb
+++ b/app/assets/javascripts/controllers/admin/calendar.js.erb
@@ -770,10 +770,10 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale
     // configuration of a new ICS source
     $scope.newCalendar = {
       color: undefined,
-      textColor: undefined,
+      text_color: undefined,
       url: undefined,
       name: undefined,
-      textHidden: false
+      text_hidden: false
     };
 
     /**
@@ -786,8 +786,8 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale
         $scope.newCalendar.url = undefined;
         $scope.newCalendar.name = undefined;
         $scope.newCalendar.color = null;
-        $scope.newCalendar.textColor = null;
-        $scope.newCalendar.textHidden = false;
+        $scope.newCalendar.text_color = null;
+        $scope.newCalendar.text_hidden = false;
       }, function (error) {
         // failed
         growl.error(_t('icalendar.create_error'));
@@ -802,9 +802,9 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale
     $scope.calendarStyle = function (calendar) {
       return {
         'border-color': calendar.color,
-        'color': calendar.textColor,
-        'width': calendar.textHidden ? '50px' : 'auto',
-        'height': calendar.textHidden ? '21px' : 'auto'
+        'color': calendar.text_color,
+        'width': calendar.text_hidden ? '50px' : 'auto',
+        'height': calendar.text_hidden ? '21px' : 'auto'
       };
     }
 
diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js
index ce0e1298d..fa5670550 100644
--- a/app/assets/javascripts/controllers/calendar.js
+++ b/app/assets/javascripts/controllers/calendar.js
@@ -59,7 +59,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$
       $scope.externals.filter(e => e.checked).forEach(e => {
         $scope.eventSources.push({
           url: `/api/i_calendar/${e.id}/events`,
-          textColor: e.textColor,
+          textColor: e.text_color,
           color: e.color
         });
       });
diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html
index 6c9411d48..c423e1aac 100644
--- a/app/assets/templates/admin/calendar/icalendar.html
+++ b/app/assets/templates/admin/calendar/icalendar.html
@@ -33,7 +33,7 @@
           <th style="width: 35%;" translate>{{ 'icalendar.name' }}</th>
           <th style="width: 35%;" translate>{{ 'icalendar.url' }}</th>
           <th translate>{{ 'icalendar.display' }}</th>
-          <th style="width: 10%;"></th>
+          <th style="width: 20%;"></th>
         </tr>
         </thead>
         <tbody>
@@ -72,12 +72,12 @@
           <div class="input-group-addon">
             <i class="fa fa-paint-brush"></i>
           </div>
-          <input type="text" minicolors ng-model="newCalendar.textColor" class="form-control" placeholder="{{ 'icalendar.text_color' | translate}}" required/>
+          <input type="text" minicolors ng-model="newCalendar.text_color" class="form-control" placeholder="{{ 'icalendar.text_color' | translate}}" required/>
         </div>
         <div class="input-group">
           <label for="hideText" class="control-label m-r" translate>{{ 'icalendar.hide_text' }}</label>
           <input bs-switch
-                 ng-model="newCalendar.textHidden"
+                 ng-model="newCalendar.text_hidden"
                  id="hideText"
                  type="checkbox"
                  class="form-control"
diff --git a/app/models/i_calendar.rb b/app/models/i_calendar.rb
index 1f63f6129..ecd0c5f0d 100644
--- a/app/models/i_calendar.rb
+++ b/app/models/i_calendar.rb
@@ -2,7 +2,7 @@
 
 # iCalendar (RFC 5545) files, stored by URL and kept with their display configuration
 class ICalendar < ActiveRecord::Base
-  has_many :i_calendar_events
+  has_many :i_calendar_events, dependent: :destroy
 
   after_create :sync_events