diff --git a/src/main/java/com/jarektoro/responsivelayout/Styleable/VisibilityCSSAdapter.java b/src/main/java/com/jarektoro/responsivelayout/Styleable/VisibilityCSSAdapter.java
index 78d6a26..fc3c021 100644
--- a/src/main/java/com/jarektoro/responsivelayout/Styleable/VisibilityCSSAdapter.java
+++ b/src/main/java/com/jarektoro/responsivelayout/Styleable/VisibilityCSSAdapter.java
@@ -34,20 +34,7 @@ public VisibilityCSSAdapter(Component component) {
 
 
     public String getCssForDisplaySize(ResponsiveLayout.DisplaySize displaySize, boolean isVisible) {
-        if (isVisible) {
-            switch (displaySize) {
-                case XS:
-                    return CSS_VISIBLE_XS;
-                case SM:
-                    return CSS_VISIBLE_SM;
-                case MD:
-                    return CSS_VISIBLE_MD;
-                case LG:
-                    return CSS_VISIBLE_LG;
-                default:
-                    return "";
-            }
-        } else {
+        if (!isVisible) {
             switch (displaySize) {
                 case XS:
                     return CSS_HIDDEN_XS;
@@ -57,11 +44,9 @@ public String getCssForDisplaySize(ResponsiveLayout.DisplaySize displaySize, boo
                     return CSS_HIDDEN_MD;
                 case LG:
                     return CSS_HIDDEN_LG;
-                default:
-                    return " ";
-
             }
         }
+        return "";
     }
 
 
@@ -109,7 +94,7 @@ public boolean isVisibleForDisplaySize(ResponsiveLayout.DisplaySize displaySize)
                 }
             }
         }
-        
+
         return true;
     }
 
@@ -119,19 +104,19 @@ public void setVisibility(ResponsiveLayout.DisplaySize displaySize, boolean isVi
                 this.component.removeStyleName(clazz);
             }
         }
-        
+
         if (displaySize == ResponsiveLayout.DisplaySize.SM) {
             for (String clazz : VisibilityCSSAdapter.smClassGroup.classes) {
                 this.component.removeStyleName(clazz);
             }
         }
-        
+
         if (displaySize == ResponsiveLayout.DisplaySize.MD) {
             for (String clazz : VisibilityCSSAdapter.mdClassGroup.classes) {
                 this.component.removeStyleName(clazz);
             }
         }
-        
+
         if (displaySize == ResponsiveLayout.DisplaySize.LG) {
             for (String clazz : VisibilityCSSAdapter.lgClassGroup.classes) {
                 this.component.removeStyleName(clazz);
diff --git a/src/main/resources/VAADIN/responsivelayout/styles.css b/src/main/resources/VAADIN/responsivelayout/styles.css
index 945ba83..8daf881 100644
--- a/src/main/resources/VAADIN/responsivelayout/styles.css
+++ b/src/main/resources/VAADIN/responsivelayout/styles.css
@@ -638,88 +638,6 @@
           .rl-row-margin.margin-lg-margin-small-lg.h-col-spacing.h-col-spacing-small {
             margin-right: .7rem !important;
             margin-left: .7rem !important; } }
-.rl-visible-xs, .rl-visible-sm, .rl-visible-md, .rl-visible-lg, .rl-visible-xs-block, .rl-visible-xs-inline, .rl-visible-xs-inline-block, .rl-visible-sm-block, .rl-visible-sm-inline, .rl-visible-sm-inline-block, .rl-visible-md-block, .rl-visible-md-inline, .rl-visible-md-inline-block, .rl-visible-lg-block, .rl-visible-lg-inline, .rl-visible-lg-inline-block {
-  display: none !important; }
-@media (max-width: 767px) {
-  .rl-visible-xs {
-    display: block !important; }
-    .rl-visible-xs.col.col-content-center {
-      display: flex !important; }
-  .rl-visible-xs table {
-    display: table !important; }
-  .rl-visible-xs tr {
-    display: table-row !important; }
-  .rl-visible-xs th, .rl-visible-xs td {
-    display: table-cell !important; } }
-@media (max-width: 767px) {
-  .rl-visible-xs-block {
-    display: block !important; } }
-@media (max-width: 767px) {
-  .rl-visible-xs-inline {
-    display: inline !important; } }
-@media (max-width: 767px) {
-  .rl-visible-xs-inline-block {
-    display: inline-block !important; } }
-@media (min-width: 768px) and (max-width: 991px) {
-  .rl-visible-sm {
-    display: block !important; }
-    .rl-visible-sm.col.col-content-center {
-      display: flex !important; }
-  .rl-visible-sm table {
-    display: table !important; }
-  .rl-visible-sm tr {
-    display: table-row !important; }
-  .rl-visible-sm th, .rl-visible-sm td {
-    display: table-cell !important; } }
-@media (min-width: 768px) and (max-width: 991px) {
-  .rl-visible-sm-block {
-    display: block !important; } }
-@media (min-width: 768px) and (max-width: 991px) {
-  .rl-visible-sm-inline {
-    display: inline !important; } }
-@media (min-width: 768px) and (max-width: 991px) {
-  .rl-visible-sm-inline-block {
-    display: inline-block !important; } }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .rl-visible-md {
-    display: block !important; }
-    .rl-visible-md.col.col-content-center {
-      display: flex !important; }
-  .rl-visible-md table {
-    display: table !important; }
-  .rl-visible-md tr {
-    display: table-row !important; }
-  .rl-visible-md th, .rl-visible-md td {
-    display: table-cell !important; } }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .rl-visible-md-block {
-    display: block !important; } }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .rl-visible-md-inline {
-    display: inline !important; } }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .rl-visible-md-inline-block {
-    display: inline-block !important; } }
-@media (min-width: 1200px) {
-  .rl-visible-lg {
-    display: block !important; }
-    .rl-visible-lg.col.col-content-center {
-      display: flex !important; }
-  .rl-visible-lg table {
-    display: table !important; }
-  .rl-visible-lg tr {
-    display: table-row !important; }
-  .rl-visible-lg th, .rl-visible-lg td {
-    display: table-cell !important; } }
-@media (min-width: 1200px) {
-  .rl-visible-lg-block {
-    display: block !important; } }
-@media (min-width: 1200px) {
-  .rl-visible-lg-inline {
-    display: inline !important; } }
-@media (min-width: 1200px) {
-  .rl-visible-lg-inline-block {
-    display: inline-block !important; } }
 @media (max-width: 767px) {
   .rl-hidden-xs {
     display: none !important; } }
diff --git a/src/main/resources/com/jarektoro/responsivelayout/_visibility.scss b/src/main/resources/com/jarektoro/responsivelayout/_visibility.scss
index 6347e1b..d7e2401 100644
--- a/src/main/resources/com/jarektoro/responsivelayout/_visibility.scss
+++ b/src/main/resources/com/jarektoro/responsivelayout/_visibility.scss
@@ -1,153 +1,5 @@
 @mixin visibility {
 
-  &-visible-xs, &-visible-sm, &-visible-md, &-visible-lg, &-visible-xs-block, &-visible-xs-inline, &-visible-xs-inline-block, &-visible-sm-block, &-visible-sm-inline, &-visible-sm-inline-block, &-visible-md-block, &-visible-md-inline, &-visible-md-inline-block, &-visible-lg-block, &-visible-lg-inline, &-visible-lg-inline-block {
-    display: none !important;
-  }
-
-  @media (max-width: 767px) {
-    &-visible-xs {
-      display: block !important;
-      &.col.col-content-center {
-        display: flex !important;
-      }
-    }
-    &-visible-xs table {
-      display: table !important;
-    }
-    &-visible-xs tr {
-      display: table-row !important;
-    }
-    &-visible-xs th, &-visible-xs td {
-      display: table-cell !important;
-    }
-  }
-
-  @media (max-width: 767px) {
-    &-visible-xs-block {
-      display: block !important;
-    }
-  }
-
-  @media (max-width: 767px) {
-    &-visible-xs-inline {
-      display: inline !important;
-    }
-  }
-
-  @media (max-width: 767px) {
-    &-visible-xs-inline-block {
-      display: inline-block !important;
-    }
-  }
-
-  @media (min-width: 768px) and (max-width: 991px) {
-    &-visible-sm {
-      display: block !important;
-      &.col.col-content-center {
-        display: flex !important;
-      }
-    }
-    &-visible-sm table {
-      display: table !important;
-    }
-    &-visible-sm tr {
-      display: table-row !important;
-    }
-    &-visible-sm th, &-visible-sm td {
-      display: table-cell !important;
-    }
-  }
-
-  @media (min-width: 768px) and (max-width: 991px) {
-    &-visible-sm-block {
-      display: block !important;
-    }
-  }
-
-  @media (min-width: 768px) and (max-width: 991px) {
-    &-visible-sm-inline {
-      display: inline !important;
-    }
-  }
-
-  @media (min-width: 768px) and (max-width: 991px) {
-    &-visible-sm-inline-block {
-      display: inline-block !important;
-    }
-  }
-
-  @media (min-width: 992px) and (max-width: 1199px) {
-    &-visible-md {
-      display: block !important;
-      &.col.col-content-center {
-        display: flex !important;
-      }
-    }
-    &-visible-md table {
-      display: table !important;
-    }
-    &-visible-md tr {
-      display: table-row !important;
-    }
-    &-visible-md th, &-visible-md td {
-      display: table-cell !important;
-    }
-  }
-
-  @media (min-width: 992px) and (max-width: 1199px) {
-    &-visible-md-block {
-      display: block !important;
-    }
-  }
-
-  @media (min-width: 992px) and (max-width: 1199px) {
-    &-visible-md-inline {
-      display: inline !important;
-    }
-  }
-
-  @media (min-width: 992px) and (max-width: 1199px) {
-    &-visible-md-inline-block {
-      display: inline-block !important;
-    }
-  }
-
-  @media (min-width: 1200px) {
-    &-visible-lg {
-      display: block !important;
-      &.col.col-content-center {
-        display: flex !important;
-      }
-    }
-    &-visible-lg table {
-      display: table !important;
-    }
-    &-visible-lg tr {
-      display: table-row !important;
-    }
-    &-visible-lg th, &-visible-lg td {
-      display: table-cell !important;
-    }
-  }
-
-  @media (min-width: 1200px) {
-    &-visible-lg-block {
-      display: block !important;
-    }
-  }
-
-  @media (min-width: 1200px) {
-    &-visible-lg-inline {
-      display: inline !important;
-    }
-  }
-
-  @media (min-width: 1200px) {
-    &-visible-lg-inline-block {
-      display: inline-block !important;
-    }
-  }
-
   @media (max-width: 767px) {
     &-hidden-xs {
       display: none !important;