diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp
index 375a67e5..a944d31c 100644
--- a/skins/material3/QskMaterial3Skin.cpp
+++ b/skins/material3/QskMaterial3Skin.cpp
@@ -1151,11 +1151,9 @@ void Editor::setupVirtualKeyboard()
     using Q = QskVirtualKeyboard;
 
     // key panel
-    setMargin( Q::ButtonPanel, 2_dp );
-
-    setBoxShape( Q::ButtonPanel, 20.0, Qt::RelativeSize );
-    setBoxBorderMetrics( Q::ButtonPanel, 2_dp );
-    setBoxBorderColors( Q::ButtonPanel, m_pal.background );
+    setMargin( Q::ButtonPanel, 5_dp );
+    setGradient( Q::ButtonPanel, m_pal.background );
+    setBoxShape( Q::ButtonPanel, 6_dp );
 
     for ( auto state : { A::NoState, Q::Focused } )
         setBoxBorderColors( Q::ButtonPanel | QskPushButton::Pressed | state,
@@ -1164,11 +1162,12 @@ void Editor::setupVirtualKeyboard()
     setAnimation( Q::ButtonPanel | A::Color, qskDuration );
     setAnimation( Q::ButtonPanel | A::Metric, qskDuration );
 
+    setColor( Q::ButtonText, m_pal.onBackground );
+    setFontRole( Q::ButtonText, QskMaterial3Skin::M3HeadlineSmall );
+
     // panel
-    setBoxShape( Q::Panel, 0 );
-    setBoxBorderMetrics( Q::Panel, 0 );
-    setGradient( Q::Panel, m_pal.secondaryContainer );
-    setBoxBorderColors( Q::Panel, m_pal.background );
+    setGradient( Q::Panel, m_pal.surfaceVariant );
+    setPadding( Q::Panel, { 3_dp, 25_dp, 3_dp, 5_dp } );
 }
 
 void Editor::setupScrollView()
diff --git a/src/inputpanel/QskInputPanelBox.cpp b/src/inputpanel/QskInputPanelBox.cpp
index 54791995..f77587dc 100644
--- a/src/inputpanel/QskInputPanelBox.cpp
+++ b/src/inputpanel/QskInputPanelBox.cpp
@@ -93,6 +93,7 @@ QskInputPanelBox::QskInputPanelBox( QQuickItem* parent )
 
     auto layout = new QskLinearBox( Qt::Vertical, this );
     layout->setDefaultAlignment( Qt::AlignLeft | Qt::AlignHCenter );
+    layout->setSpacing( 0 );
 
     layout->addItem( m_data->prompt );
     layout->addItem( m_data->inputProxy );
diff --git a/src/inputpanel/QskVirtualKeyboard.cpp b/src/inputpanel/QskVirtualKeyboard.cpp
index f9d08a93..15b7ea04 100644
--- a/src/inputpanel/QskVirtualKeyboard.cpp
+++ b/src/inputpanel/QskVirtualKeyboard.cpp
@@ -29,9 +29,11 @@ namespace
             , m_row( row )
             , m_column( column )
         {
+#if 0
             QskTextOptions options;
             options.setFontSizeMode( QskTextOptions::VerticalFit );
             setTextOptions( options );
+#endif
 
             setFocusPolicy( Qt::TabFocus );
         }
@@ -278,15 +280,6 @@ QskAspect::Subcontrol QskVirtualKeyboard::substitutedSubcontrol(
     if ( subControl == QskBox::Panel )
         return QskVirtualKeyboard::Panel;
 
-#if 1
-    // TODO ...
-    if ( subControl == QskVirtualKeyboard::ButtonPanel )
-        return QskPushButton::Panel;
-
-    if ( subControl == QskVirtualKeyboard::ButtonText )
-        return QskPushButton::Text;
-#endif
-
     return Inherited::substitutedSubcontrol( subControl );
 }