diff --git a/b0esche_cloud/lib/widgets/account_settings_dialog.dart b/b0esche_cloud/lib/widgets/account_settings_dialog.dart
index 8aef798..bdcd9db 100644
--- a/b0esche_cloud/lib/widgets/account_settings_dialog.dart
+++ b/b0esche_cloud/lib/widgets/account_settings_dialog.dart
@@ -376,19 +376,23 @@ class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
             ),
           ),
           const SizedBox(height: 8),
-          TextFormField(
-            controller: _displayNameController,
-            style: TextStyle(color: AppTheme.primaryText),
-            decoration: InputDecoration(
-              hintText: 'Enter display name',
-              hintStyle: TextStyle(color: AppTheme.secondaryText),
-              border: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+          Container(
+            decoration: BoxDecoration(
+              color: AppTheme.primaryBackground.withValues(alpha: 0.5),
+              borderRadius: BorderRadius.circular(16),
+              border: Border.all(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
               ),
-              enabledBorder: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+            ),
+            child: TextFormField(
+              controller: _displayNameController,
+              cursorColor: AppTheme.accentColor,
+              style: TextStyle(color: AppTheme.primaryText),
+              decoration: InputDecoration(
+                hintText: 'Enter display name',
+                hintStyle: TextStyle(color: AppTheme.secondaryText),
+                border: InputBorder.none,
+                contentPadding: const EdgeInsets.all(12),
               ),
             ),
           ),
@@ -434,20 +438,24 @@ class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
             ),
           ),
           const SizedBox(height: 8),
-          TextFormField(
-            controller: _currentPasswordController,
-            obscureText: true,
-            style: TextStyle(color: AppTheme.primaryText),
-            decoration: InputDecoration(
-              hintText: 'Enter current password',
-              hintStyle: TextStyle(color: AppTheme.secondaryText),
-              border: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+          Container(
+            decoration: BoxDecoration(
+              color: AppTheme.primaryBackground.withValues(alpha: 0.5),
+              borderRadius: BorderRadius.circular(16),
+              border: Border.all(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
               ),
-              enabledBorder: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+            ),
+            child: TextFormField(
+              controller: _currentPasswordController,
+              obscureText: true,
+              cursorColor: AppTheme.accentColor,
+              style: TextStyle(color: AppTheme.primaryText),
+              decoration: InputDecoration(
+                hintText: 'Enter current password',
+                hintStyle: TextStyle(color: AppTheme.secondaryText),
+                border: InputBorder.none,
+                contentPadding: const EdgeInsets.all(12),
               ),
             ),
           ),
@@ -462,20 +470,24 @@ class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
             ),
           ),
           const SizedBox(height: 8),
-          TextFormField(
-            controller: _newPasswordController,
-            obscureText: true,
-            style: TextStyle(color: AppTheme.primaryText),
-            decoration: InputDecoration(
-              hintText: 'Enter new password',
-              hintStyle: TextStyle(color: AppTheme.secondaryText),
-              border: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+          Container(
+            decoration: BoxDecoration(
+              color: AppTheme.primaryBackground.withValues(alpha: 0.5),
+              borderRadius: BorderRadius.circular(16),
+              border: Border.all(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
               ),
-              enabledBorder: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+            ),
+            child: TextFormField(
+              controller: _newPasswordController,
+              obscureText: true,
+              cursorColor: AppTheme.accentColor,
+              style: TextStyle(color: AppTheme.primaryText),
+              decoration: InputDecoration(
+                hintText: 'Enter new password',
+                hintStyle: TextStyle(color: AppTheme.secondaryText),
+                border: InputBorder.none,
+                contentPadding: const EdgeInsets.all(12),
               ),
             ),
           ),
@@ -490,20 +502,24 @@ class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
             ),
           ),
           const SizedBox(height: 8),
-          TextFormField(
-            controller: _confirmPasswordController,
-            obscureText: true,
-            style: TextStyle(color: AppTheme.primaryText),
-            decoration: InputDecoration(
-              hintText: 'Confirm new password',
-              hintStyle: TextStyle(color: AppTheme.secondaryText),
-              border: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+          Container(
+            decoration: BoxDecoration(
+              color: AppTheme.primaryBackground.withValues(alpha: 0.5),
+              borderRadius: BorderRadius.circular(16),
+              border: Border.all(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
               ),
-              enabledBorder: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(8),
-                borderSide: BorderSide(color: AppTheme.secondaryText),
+            ),
+            child: TextFormField(
+              controller: _confirmPasswordController,
+              obscureText: true,
+              cursorColor: AppTheme.accentColor,
+              style: TextStyle(color: AppTheme.primaryText),
+              decoration: InputDecoration(
+                hintText: 'Confirm new password',
+                hintStyle: TextStyle(color: AppTheme.secondaryText),
+                border: InputBorder.none,
+                contentPadding: const EdgeInsets.all(12),
               ),
             ),
           ),