diff --git a/pom.xml b/pom.xml
index 5f295ff..02ef836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <drivers.dir>${project.basedir}/drivers</drivers.dir>
         <jetty.version>11.0.26</jetty.version>
-        <flowingcode.commons.demo.version>5.0.0</flowingcode.commons.demo.version>
+        <flowingcode.commons.demo.version>5.1.0</flowingcode.commons.demo.version>
         <frontend.hotdeploy>true</frontend.hotdeploy>
     </properties>
 
@@ -474,6 +474,7 @@
                                         <exclude>**/it/*</exclude>
                                         <exclude>**/DemoView.class</exclude>
                                         <exclude>**/DemoLayout.class</exclude>
+                                        <exclude>**/AppShellConfiguratorImpl.class</exclude>
                                     </excludes>
                                 </configuration>
                             </execution>
@@ -502,7 +503,7 @@
             <properties>
                 <maven.compiler.source>21</maven.compiler.source>
                 <maven.compiler.target>21</maven.compiler.target>
-                <vaadin.version>25.0.0</vaadin.version>
+                <vaadin.version>25.0.3</vaadin.version>
                 <jetty.version>11.0.26</jetty.version>
             </properties>
             <dependencies>
diff --git a/src/main/java/com/flowingcode/vaadin/addons/dayofweekselector/DayOfWeekSelector.java b/src/main/java/com/flowingcode/vaadin/addons/dayofweekselector/DayOfWeekSelector.java
index 78b03ef..84a9f90 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/dayofweekselector/DayOfWeekSelector.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/dayofweekselector/DayOfWeekSelector.java
@@ -47,6 +47,8 @@
 @CssImport("./styles/fc-days-of-week-selector-styles.css")
 @CssImport(value = "./styles/vaadin-context-menu-list-box.css",
     themeFor = "vaadin-context-menu-list-box")
+@CssImport(value = "./styles/fc-days-of-week-selector.css",
+    themeFor = "fc-days-of-week-selector")
 @JsModule("./src/fc-days-of-week-selector.ts")
 @Tag("fc-days-of-week-selector")
 public class DayOfWeekSelector extends CustomField<Set<DayOfWeek>> {
diff --git a/src/main/resources/META-INF/frontend/styles/fc-days-of-week-selector.css b/src/main/resources/META-INF/frontend/styles/fc-days-of-week-selector.css
new file mode 100644
index 0000000..c0e1dfc
--- /dev/null
+++ b/src/main/resources/META-INF/frontend/styles/fc-days-of-week-selector.css
@@ -0,0 +1,52 @@
+/*-
+ * #%L
+ * Day of Week Selector Add-on
+ * %%
+ * Copyright (C) 2023 - 2026 Flowing Code
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+ 
+/* FOR VAADIN 25 */
+/* for hidden buttons in the overflow */
+ 
+vaadin-button.fc-days-of-week-selector-button {
+	--lumo-button-size: 40px;
+    border-radius: 50%;
+    width: var(--lumo-button-size);
+    max-width: var(--lumo-button-size);
+    min-width: var(--lumo-button-size);
+    height: var(--lumo-button-size);
+    max-height: var(--lumo-button-size);
+    min-height: var(--lumo-button-size);
+    padding-left: calc(var(--lumo-button-size) / 4);
+    padding-right: calc(var(--lumo-button-size) / 4);
+}
+
+vaadin-button.fc-days-of-week-selector-button[theme~='primary'][disabled]::part(label) {
+    opacity: 1;
+}
+
+vaadin-button.fc-days-of-week-selector-button[disabled].readOnly{
+    color: var(--lumo-secondary-text-color);
+    background: transparent;
+}
+
+vaadin-button.fc-days-of-week-selector-button[theme~='primary'][disabled].readOnly {
+    border: var(--vaadin-input-field-readonly-border, 1px dashed var(--lumo-contrast-30pct));
+}
+
+vaadin-button.fc-days-of-week-selector-button[focus-ring]{
+    box-shadow: none;
+}
diff --git a/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java
new file mode 100644
index 0000000..5f67d7b
--- /dev/null
+++ b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java
@@ -0,0 +1,28 @@
+/*-
+ * #%L
+ * Day of Week Selector Add-on
+ * %%
+ * Copyright (C) 2023 - 2026 Flowing Code
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package com.flowingcode.vaadin.addons;
+
+import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.Theme;
+
+@Theme
+public class AppShellConfiguratorImpl implements AppShellConfigurator {
+
+}