diff --git a/src/main/frontend/themes/bakery/styles.css b/src/main/frontend/themes/bakery/styles.css
index 24754d29a..a61737e9e 100644
--- a/src/main/frontend/themes/bakery/styles.css
+++ b/src/main/frontend/themes/bakery/styles.css
@@ -8,6 +8,12 @@
   }
 }
 
+.app-name {
+  font-size:var(--lumo-font-size-xl);
+  font-weight:bold;
+  padding-left: 1em
+}
+
 .v-loading-indicator,
 .v-system-error,
 .v-reconnect-dialog {
diff --git a/src/main/java/com/vaadin/starter/bakery/ui/MainView.java b/src/main/java/com/vaadin/starter/bakery/ui/MainView.java
index a34bf2607..f01990135 100644
--- a/src/main/java/com/vaadin/starter/bakery/ui/MainView.java
+++ b/src/main/java/com/vaadin/starter/bakery/ui/MainView.java
@@ -1,5 +1,7 @@
 package com.vaadin.starter.bakery.ui;
 
+import static com.vaadin.flow.i18n.I18NProvider.translate;
+
 import static com.vaadin.starter.bakery.ui.utils.BakeryConst.TITLE_DASHBOARD;
 import static com.vaadin.starter.bakery.ui.utils.BakeryConst.TITLE_LOGOUT;
 import static com.vaadin.starter.bakery.ui.utils.BakeryConst.TITLE_PRODUCTS;
@@ -52,7 +54,8 @@ public void init() {
 		confirmDialog.setCancelButtonTheme("raised tertiary");
 
 		this.setDrawerOpened(false);
-		Span appName = new Span("###Bakery###");
+		Span appName = new Span(translate("app.title"));
+		appName.addClassName("app-name");
 		appName.addClassName("hide-on-mobile");
 
 		menu = createMenuTabs();
@@ -150,4 +153,4 @@ private static <T extends HasComponents> T populateLink(T a, VaadinIcon icon, St
 		a.add(title);
 		return a;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/vaadin/starter/bakery/ui/views/admin/products/ProductsView.java b/src/main/java/com/vaadin/starter/bakery/ui/views/admin/products/ProductsView.java
index f26cc2343..7a8128f96 100644
--- a/src/main/java/com/vaadin/starter/bakery/ui/views/admin/products/ProductsView.java
+++ b/src/main/java/com/vaadin/starter/bakery/ui/views/admin/products/ProductsView.java
@@ -1,5 +1,7 @@
 package com.vaadin.starter.bakery.ui.views.admin.products;
 
+import static com.vaadin.flow.i18n.I18NProvider.translate;
+
 import com.vaadin.flow.component.crud.BinderCrudEditor;
 import com.vaadin.flow.component.formlayout.FormLayout;
 import com.vaadin.flow.component.grid.Grid;
@@ -51,9 +53,9 @@ protected String getBasePage() {
 	}
 
 	private static BinderCrudEditor<Product> createForm() {
-		TextField name = new TextField("Product name");
+		TextField name = new TextField(translate("product.name"));
 		name.getElement().setAttribute("colspan", "2");
-		TextField price = new TextField("Unit price");
+		TextField price = new TextField(translate("unit.price"));
 		price.getElement().setAttribute("colspan", "2");
 
 		FormLayout form = new FormLayout(name, price);
diff --git a/src/main/java/com/vaadin/starter/bakery/ui/views/admin/users/UsersView.java b/src/main/java/com/vaadin/starter/bakery/ui/views/admin/users/UsersView.java
index 109791d50..d8d8a52af 100644
--- a/src/main/java/com/vaadin/starter/bakery/ui/views/admin/users/UsersView.java
+++ b/src/main/java/com/vaadin/starter/bakery/ui/views/admin/users/UsersView.java
@@ -1,5 +1,7 @@
 package com.vaadin.starter.bakery.ui.views.admin.users;
 
+import static com.vaadin.flow.i18n.I18NProvider.translate;
+
 import jakarta.annotation.security.RolesAllowed;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,15 +55,15 @@ protected String getBasePage() {
 	}
 
 	private static BinderCrudEditor<User> createForm(PasswordEncoder passwordEncoder) {
-		EmailField email = new EmailField("Email (login)");
+		EmailField email = new EmailField(translate("email.field"));
 		email.getElement().setAttribute("colspan", "2");
-		TextField first = new TextField("First name");
-		TextField last = new TextField("Last name");
-		PasswordField password = new PasswordField("Password");
+		TextField first = new TextField(translate("first.name.field"));
+		TextField last = new TextField(translate("last.name.field"));
+		PasswordField password = new PasswordField(translate("password.field"));
 		password.getElement().setAttribute("colspan", "2");
 		ComboBox<String> role = new ComboBox<>();
 		role.getElement().setAttribute("colspan", "2");
-		role.setLabel("Role");
+		role.setLabel(translate("role.field"));
 
 		FormLayout form = new FormLayout(email, first, last, password, role);
 
diff --git a/src/main/resources/vaadin-i18n/translations.properties b/src/main/resources/vaadin-i18n/translations.properties
new file mode 100644
index 000000000..421372775
--- /dev/null
+++ b/src/main/resources/vaadin-i18n/translations.properties
@@ -0,0 +1,8 @@
+app.title=Bakery
+product.name=Product name
+unit.price=Unit price
+email.field=Email (login)
+first.name.field=First name
+last.name.field=Last name
+password.field=Password
+role.field=Role