diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java
index 779afcef1..7360eb7c9 100644
--- a/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java
+++ b/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java
@@ -799,8 +799,7 @@ private void refreshDayButtonsVisibilityAndLabel()
 			ToggleButton lToggleButton = dayButtons.get(lIdx); 
 			lToggleButton.setVisible(true);
 			lToggleButton.setText("" + i);
-			lToggleButton.getStyleClass().remove("weekend");
-			lToggleButton.getStyleClass().remove("weekday");
+			lToggleButton.getStyleClass().removeAll("weekend", "weekday");
 			lToggleButton.getStyleClass().add(isWeekdayWeekend(lIdx % 7) ? "weekend" : "weekday"); 
 			lToggleButton.setDisable( disabledCalendars != null && find(disabledCalendars, lCalendar) != null );
 			
@@ -815,14 +814,11 @@ private void refreshDayButtonsVisibilityAndLabel()
 			}
 			
 			// highligh
+			lToggleButton.getStyleClass().remove("highlight");
 			if (highlightedCalendars != null && find(highlightedCalendars, lCalendar) != null)
 			{
 				lToggleButton.getStyleClass().add("highlight");
 			}
-			else
-			{
-				lToggleButton.getStyleClass().remove("highlight");
-			}
 		}
 
 		// hide the trailing buttons