diff -Nurd openmoko-standard/gtk-2.0/gtkbutton openmoko-standard-qvga/gtk-2.0/gtkbutton
--- openmoko-standard/gtk-2.0/gtkbutton	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkbutton	2007-02-17 20:23:32.000000000 +0100
@@ -5,7 +5,7 @@
             recolorable     = TRUE
             state           = NORMAL
             file            = "gtkbutton.png"
-            border          = { 22, 33, 18, 25 }
+            border          = { 11, 16, 9, 12 }
             stretch         = TRUE
         }
         image {
@@ -13,7 +13,7 @@
             recolorable     = TRUE
             state           = PRELIGHT
             file            = "gtkbutton.png"
-            border          = { 22, 33, 18, 25 }
+            border          = { 11, 16, 9, 12 }
             stretch         = TRUE
         }
         image {
@@ -21,18 +21,18 @@
             recolorable     = TRUE
             state           = ACTIVE
             file            = "gtkbutton_p.png"
-            border          = { 22, 33, 18, 25 }
+            border          = { 11, 16, 9, 12 }
             stretch         = TRUE
         }
     }
-    xthickness = 22
-    ythickness = 10
+    xthickness = 11
+    ythickness = 5
     GtkButton::focus-line-width = 0
 }
 class "GtkButton" style "gtkbutton"
 
 style "gtkbutton-label" {
-    font_name = "Vera Sans 10"
+    font_name = "Vera Sans 5"
     fg[NORMAL] = "#e5e5e5"
     fg[PRELIGHT] = "#ffffff"
 }
diff -Nurd openmoko-standard/gtk-2.0/gtkcheckbutton openmoko-standard-qvga/gtk-2.0/gtkcheckbutton
--- openmoko-standard/gtk-2.0/gtkcheckbutton	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkcheckbutton	2007-02-17 15:38:06.000000000 +0100
@@ -82,7 +82,7 @@
 
 style "gtkcheckbutton-label"
 {
-    font_name = "Vera Sans 14"
+    font_name = "Vera Sans 7"
     fg[NORMAL] = "#cccccc"
     fg[PRELIGHT] = "#eeeeee"
 }
diff -Nurd openmoko-standard/gtk-2.0/gtkcombobox openmoko-standard-qvga/gtk-2.0/gtkcombobox
--- openmoko-standard/gtk-2.0/gtkcombobox	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkcombobox	2007-02-17 15:38:12.000000000 +0100
@@ -10,7 +10,7 @@
 
 style "gtkcombobox-cellrenderer"
 {
-    font_name = "Vera Sans 16"
+    font_name = "Vera Sans 8"
     text[NORMAL] = "#ff0000"
     fg[NORMAL] = "#ff0000"
 }
diff -Nurd openmoko-standard/gtk-2.0/gtkentry openmoko-standard-qvga/gtk-2.0/gtkentry
--- openmoko-standard/gtk-2.0/gtkentry	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkentry	2007-02-17 20:28:25.000000000 +0100
@@ -1,13 +1,13 @@
 style "gtkentry" {
-    xthickness = 11
-    ythickness = 4
+    xthickness = 6
+    ythickness = 2
     engine "pixmap" {
         image {
             function        = SHADOW
             shadow          = IN
             file            = "gtkentry.png"
             recolorable     = TRUE
-            border          = { 17, 17, 15, 15 }
+            border          = { 8, 8, 7, 7 }
               }
 	 }
     GtkEntry::inner-border  = { 0, 0, 0, 0 }
diff -Nurd openmoko-standard/gtk-2.0/gtkmenu openmoko-standard-qvga/gtk-2.0/gtkmenu
--- openmoko-standard/gtk-2.0/gtkmenu	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkmenu	2007-02-17 15:53:15.000000000 +0100
@@ -4,11 +4,11 @@
             function        = BOX
             recolorable     = TRUE
             file            = "gtkmenu.png"
-            border          = { 2, 2, 2, 10 }
+            border          = { 1, 1, 1, 5 }
             stretch         = TRUE
         }
     }
-    ythickness = 8
+    ythickness = 4
 }
 class "GtkMenu" style "gtkmenu"
 
diff -Nurd openmoko-standard/gtk-2.0/gtkmenuitem openmoko-standard-qvga/gtk-2.0/gtkmenuitem
--- openmoko-standard/gtk-2.0/gtkmenuitem	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkmenuitem	2007-02-17 15:38:23.000000000 +0100
@@ -21,7 +21,7 @@
 class "GtkMenuItem" style "gtkmenuitem"
 
 style "gtkmenuitem-label" {
-    font_name = "Vera Sans 13"
+    font_name = "Vera Sans 7"
     fg[NORMAL] = "#e5e5e5"
     fg[PRELIGHT] = "#ffffff"
 
@@ -39,7 +39,7 @@
 class "GtkCellView" style "gtkmenuitem-label"
 
 style "gtkmenubar-gtkmenuitem-label" {
-    font_name = "Vera Sans 13"
+    font_name = "Vera Sans 7"
     fg[NORMAL] = "#000000"
     fg[PRELIGHT] = "#000000"
 }
diff -Nurd openmoko-standard/gtk-2.0/gtkpaned openmoko-standard-qvga/gtk-2.0/gtkpaned
--- openmoko-standard/gtk-2.0/gtkpaned	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkpaned	2007-02-17 16:15:41.000000000 +0100
@@ -55,7 +55,7 @@
             orientation     = VERTICAL
         }
     }
-    GtkPaned::handle-size   = 15
+    GtkPaned::handle-size   = 8
 }
 
 class "GtkWidget" style "gtkpaned"
diff -Nurd openmoko-standard/gtk-2.0/gtkradiobutton openmoko-standard-qvga/gtk-2.0/gtkradiobutton
--- openmoko-standard/gtk-2.0/gtkradiobutton	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkradiobutton	2007-02-17 20:24:51.000000000 +0100
@@ -71,18 +71,18 @@
             function        = FLAT_BOX
             recolorable     = TRUE
             file            = "transparency100.png"
-            border          = { 10,5,5,10 }
+            border          = { 5,2,2,5 }
             stretch         = TRUE
         }
     }
-    GtkCheckButton::indicator-size = 35
-    GtkCheckButton::indicator-spacing = 5
+    GtkCheckButton::indicator-size = 18
+    GtkCheckButton::indicator-spacing = 2
 }
 class "GtkRadioButton" style "gtkradiobutton"
 
 style "gtkradiobutton-label"
 {
-    font_name = "Vera Sans 14"
+    font_name = "Vera Sans 7"
     fg[NORMAL] = "#cccccc"
     fg[PRELIGHT] = "#eeeeee"
 }
diff -Nurd openmoko-standard/gtk-2.0/gtkrc openmoko-standard-qvga/gtk-2.0/gtkrc
--- openmoko-standard/gtk-2.0/gtkrc	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkrc	2007-02-17 15:50:18.000000000 +0100
@@ -78,7 +78,7 @@
             stretch         = TRUE
         }
     }
-    font_name = "Vera Sans 16"
+    font_name = "Vera Sans 8"
 }
 
 class "GtkWidget" style "moko-window-default"
diff -Nurd openmoko-standard/gtk-2.0/gtkscrollbar openmoko-standard-qvga/gtk-2.0/gtkscrollbar
--- openmoko-standard/gtk-2.0/gtkscrollbar	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtkscrollbar	2007-02-17 20:44:43.000000000 +0100
@@ -2,8 +2,8 @@
 #
 # properties
 #
-    GtkScrollbar::slider_width = 37
-    GtkScrollbar::stepper_size = 26
+    GtkScrollbar::slider_width = 19
+    GtkScrollbar::stepper_size = 13
     GtkScrollbar::stepper_spacing = 0
 
     GtkScrollbar::has_backward_stepper = 0
@@ -25,7 +25,7 @@
         recolorable     = TRUE
         detail          = "slider"
         file            = "openmoko-scrollbar-horizontal.png"
-        border          = { 13, 12, 2, 2 }
+        border          = { 6, 6, 1, 1 }
         stretch         = TRUE
         orientation     = HORIZONTAL
     }
@@ -35,7 +35,7 @@
         detail          = "slider"
         state           = NORMAL
         file            = "openmoko-scrollbar-vertical.png"
-        border          = { 2, 2, 15, 15 }
+        border          = { 1, 1, 7, 7 }
         stretch         = TRUE
         orientation     = VERTICAL
     }
@@ -45,7 +45,7 @@
         detail          = "slider"
         state           = PRELIGHT
         file            = "openmoko-scrollbar-vertical-pressed.png"
-        border          = { 2, 2, 15, 15 }
+        border          = { 1, 1, 7, 7 }
         stretch         = TRUE
         orientation     = VERTICAL
     }
@@ -57,7 +57,7 @@
         recolorable     = TRUE
         detail          = "trough"
         file            = "vtrough.png"
-        border          = { 3, 3, 23, 23 }
+        border          = { 1, 1, 11, 11 }
         stretch         = TRUE
         orientation     = VERTICAL
     }
@@ -66,7 +66,7 @@
         recolorable     = TRUE
         detail          = "trough"
         file            = "htrough.png"
-        border          = { 23, 23, 3, 3 }
+        border          = { 11, 11, 1, 1 }
         stretch         = TRUE
         orientation     = HORIZONTAL
     }
@@ -78,7 +78,7 @@
         function        = STEPPER
         state           = INSENSITIVE
         file            = "openmoko-scroll-action-btn-up.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = UP
     }
@@ -87,7 +87,7 @@
         function        = STEPPER
         state           = NORMAL
         file            = "openmoko-scroll-action-btn-up.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = UP
     }
@@ -96,7 +96,7 @@
         function        = STEPPER
         state           = PRELIGHT
         file            = "openmoko-scroll-action-btn-up.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = UP
     }
@@ -105,7 +105,7 @@
         function        = STEPPER
         state           = ACTIVE
         file            = "openmoko-scroll-action-btn-up-pressed.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = UP
     }
@@ -114,7 +114,7 @@
         function        = STEPPER
         state           = INSENSITIVE
         file            = "openmoko-scroll-action-btn-down.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = DOWN
     }
@@ -123,7 +123,7 @@
         function        = STEPPER
         state           = NORMAL
         file            = "openmoko-scroll-action-btn-down.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = DOWN
     }
@@ -132,7 +132,7 @@
         function        = STEPPER
         state           = PRELIGHT
         file            = "openmoko-scroll-action-btn-down.png"
-        border          = { 1, 1, 4, 4 }
+        border          = { 1, 1, 2, 2 }
         stretch         = TRUE
         arrow_direction = DOWN
     }
@@ -141,7 +141,7 @@
         function        = STEPPER
         state           = ACTIVE
         file            = "openmoko-scroll-action-btn-down-pressed.png"
-        border          = { 1,1,4,4 }
+        border          = { 1,1,2,2 }
         stretch         = TRUE
         arrow_direction = DOWN
     }
diff -Nurd openmoko-standard/gtk-2.0/gtktreeview openmoko-standard-qvga/gtk-2.0/gtktreeview
--- openmoko-standard/gtk-2.0/gtktreeview	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/gtktreeview	2007-02-17 16:10:37.000000000 +0100
@@ -25,7 +25,7 @@
 #      }
     }
     GtkTreeView::allow_rules = 1
-    GtkTreeView::vertical_separator = 6
+    GtkTreeView::vertical_separator = 3
     GtkTreeView::even_row_color = "#f7f7f7"
     GtkTreeView::odd_row_color = "#e7e7e7"
 
@@ -46,7 +46,7 @@
             recolorable     = TRUE
             #state           = NORMAL
             file            = "gtktreeview-gtkbutton.png"
-            border          = { 5, 5, 5, 5 }
+            border          = { 2, 2, 2, 2 }
             stretch         = TRUE
         }
     }
@@ -63,7 +63,7 @@
 # But this will affect normal GtkButton, is there a better solution?
 style "gtktreeview-button-label"
 {
-    font_name = "Vera Sans Bold 13"
+    font_name = "Vera Sans Bold 7"
     fg[NORMAL] = "#999999"
 }
 widget "*.GtkTreeView.*.GtkLabel" style "gtktreeview-button-label"
@@ -75,7 +75,7 @@
 style "gtktreeview-black"
 {
     GtkTreeView::allow-rules = 1
-    GtkTreeView::expander_size = 47
+    GtkTreeView::expander_size = 24
     
     text[NORMAL]      = "#ffffff"
     text[SELECTED]    = "#ffffff"
diff -Nurd openmoko-standard/gtk-2.0/mokodialogwindow openmoko-standard-qvga/gtk-2.0/mokodialogwindow
--- openmoko-standard/gtk-2.0/mokodialogwindow	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokodialogwindow	2007-02-17 15:39:02.000000000 +0100
@@ -7,7 +7,7 @@
 
 style "mokodialogwindow-title-label"
 {
-    font_name = "Vera Sans 14"
+    font_name = "Vera Sans 7"
     fg[NORMAL] = "#cccccc"
 }
 widget "*.mokodialogwindow-title-label" style "mokodialogwindow-title-label"
diff -Nurd openmoko-standard/gtk-2.0/mokofingerbutton openmoko-standard-qvga/gtk-2.0/mokofingerbutton
--- openmoko-standard/gtk-2.0/mokofingerbutton	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokofingerbutton	2007-02-17 15:25:37.000000000 +0100
@@ -5,7 +5,7 @@
             recolorable     = TRUE
             state           = NORMAL
             file            = "btn_type01.png"
-            border          = { 17, 17, 17, 17 }
+            border          = { 8, 8, 8, 8 }
             stretch         = TRUE
         }
         image {
@@ -13,7 +13,7 @@
             recolorable     = TRUE
             state           = PRELIGHT
             file            = "btn_type01.png"
-            border          = { 17, 17, 17, 17 }
+            border          = { 8, 8, 8, 8 }
             stretch         = TRUE
         }
         image {
@@ -21,12 +21,12 @@
             recolorable     = TRUE
             state           = ACTIVE
             file            = "btn_type01_p.png"
-            border          = { 17, 17, 17, 17 }
+            border          = { 8, 8, 8, 8 }
             stretch         = TRUE
         }
     }
-    xthickness = 10
-    ythickness = 10
+    xthickness = 5
+    ythickness = 5
     GtkButton::focus-line-width = 0
 }
 widget "*.mokofingerbutton-orange" style "mokofingerbutton-orange"
@@ -38,7 +38,7 @@
             recolorable     = TRUE
             state           = NORMAL
             file            = "btn_type04.png"
-            border          = { 27, 27, 29, 29 }
+            border          = { 13, 13, 14, 14 }
             stretch         = TRUE
         }
         image {
@@ -46,7 +46,7 @@
             recolorable     = TRUE
             state           = PRELIGHT
             file            = "btn_type04.png"
-            border          = { 27, 27, 29, 29 }
+            border          = { 13, 13, 14, 14 }
             stretch         = TRUE
         }
         image {
@@ -54,12 +54,12 @@
             recolorable     = TRUE
             state           = ACTIVE
             file            = "btn_type04_p.png"
-            border          = { 27, 27, 29, 29 }
+            border          = { 13, 13, 14, 14 }
             stretch         = TRUE
         }
     }
-    xthickness = 10
-    ythickness = 10
+    xthickness = 5
+    ythickness = 5
     GtkButton::focus-line-width = 0
 }
 widget "*.mokofingerbutton-black" style "mokofingerbutton-black"
@@ -71,7 +71,7 @@
             recolorable     = TRUE
             state           = NORMAL
             file            = "btn_type05.png"
-            border          = { 40, 20, 8, 7 }
+            border          = { 20, 10, 4, 3 }
             stretch         = TRUE
         }
         image {
@@ -79,7 +79,7 @@
             recolorable     = TRUE
             state           = PRELIGHT
             file            = "btn_type05.png"
-            border          = { 40, 20, 8, 7 }
+            border          = { 20, 10, 4, 3 }
             stretch         = TRUE
         }
         image {
@@ -87,12 +87,12 @@
             recolorable     = TRUE
             state           = ACTIVE
             file            = "btn_type05_p.png"
-            border          = { 40, 20, 8, 7 }
+            border          = { 20, 10, 4, 3 }
             stretch         = TRUE
         }
     }
-    xthickness = 10
-    ythickness = 10
+    xthickness = 5
+    ythickness = 5
     GtkButton::focus-line-width = 0
 }
 widget "*.mokofingerbutton-dialer" style "mokofingerbutton-dialer"
@@ -122,7 +122,7 @@
             stretch         = TRUE
         }
     }
-    MokoPixmapButton::size-request = { 0, 63, 0, 62 }
+    MokoPixmapButton::size-request = { 0, 32, 0, 31 }
     xthickness = 0
     ythickness = 0
     GtkButton::focus-line-width = 0
@@ -155,7 +155,7 @@
             stretch         = TRUE
         }
     }
-    MokoPixmapButton::size-request = { 0, 202, 0, 188 }
+    MokoPixmapButton::size-request = { 0, 101, 0, 94 }
     xthickness = 0
     ythickness = 0
     GtkButton::focus-line-width = 0
diff -Nurd openmoko-standard/gtk-2.0/mokofingertoolbox openmoko-standard-qvga/gtk-2.0/mokofingertoolbox
--- openmoko-standard/gtk-2.0/mokofingertoolbox	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokofingertoolbox	2007-02-17 15:48:25.000000000 +0100
@@ -25,7 +25,7 @@
             stretch         = TRUE
         }
     }
-    MokoPixmapButton::size-request = { 0, 47, 0, 104 }
+    MokoPixmapButton::size-request = { 0, 24, 0, 52 }
     xthickness = 0
     ythickness = 0
     GtkButton::focus-line-width = 0
@@ -59,7 +59,7 @@
             stretch         = TRUE
         }
     }
-    MokoPixmapButton::size-request = { 0, 47, 0, 104 }
+    MokoPixmapButton::size-request = { 0, 24, 0, 52 }
     xthickness = 0
     ythickness = 0
     GtkButton::focus-line-width = 0
@@ -93,7 +93,7 @@
             stretch         = TRUE
         }
     }
-    MokoPixmapButton::size-request = { 0, 69, 0, 104 }
+    MokoPixmapButton::size-request = { 0, 35, 0, 52 }
     xthickness = 0
     ythickness = 0
     GtkButton::focus-line-width = 0
@@ -103,7 +103,7 @@
 style "mokofingertoolbox"
 {
     bg_pixmap[NORMAL] = "mokofingertoolbox.png"
-    MokoAlignment::padding = { 35, 0, 0, 0 }
+    MokoAlignment::padding = { 17, 0, 0, 0 }
 }
 widget "*.mokofingertoolbox" style "mokofingertoolbox"
 
diff -Nurd openmoko-standard/gtk-2.0/mokofingerwheel openmoko-standard-qvga/gtk-2.0/mokofingerwheel
--- openmoko-standard/gtk-2.0/mokofingerwheel	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokofingerwheel	2007-02-17 15:05:52.000000000 +0100
@@ -3,8 +3,8 @@
     bg_pixmap[PRELIGHT] = "wheel.png"
     bg_pixmap[ACTIVE] = "wheel_p.png"
 
-    MokoFixed::size-request = { 0, 152, 0, 152 }
-    MokoFixed::cargo-border = { 10, 43, 108, 140 }
+    MokoFixed::size-request = { 0, 76, 0, 76 }
+    MokoFixed::cargo-border = { 5, 22, 54, 70 }
 }
 widget "*.mokofingerwheel" style "mokofingerwheel"
 
diff -Nurd openmoko-standard/gtk-2.0/mokomenubox openmoko-standard-qvga/gtk-2.0/mokomenubox
--- openmoko-standard/gtk-2.0/mokomenubox	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokomenubox	2007-02-17 15:43:07.000000000 +0100
@@ -4,11 +4,11 @@
             function        = BOX
             recolorable     = TRUE
             file            = "openmoko-application-menu-bg.png"
-            border          = { 0, 20, 0, 0 }
+            border          = { 0, 10, 0, 0 }
             stretch         = TRUE
         }
     }
-    xthickness = 5
+    xthickness = 3
 }
 widget "*.mokomenubox-application-menubar" style "mokomenubox-application-menubar"
 class "GtkMenuBar" style "mokomenubox-application-menubar"
@@ -19,23 +19,23 @@
             function        = BOX
             recolorable     = TRUE
             file            = "openmoko-filter-menu-bg.png"
-            border          = { 0, 30, 0, 0 }
+            border          = { 0, 15, 0, 0 }
             stretch         = TRUE
         }
     }
-    xthickness = 5
+    xthickness = 3
 }
 widget "*.mokomenubox-filter-menubar" style "mokomenubox-filter-menubar"
 
 style "mokomenubox-application-menubar-items" {
-    font_name = "Vera Sans 16"
+    font_name = "Vera Sans 8"
     fg[NORMAL] = "#333333"
     fg[PRELIGHT] = "#333333"
 }
 widget "*.mokomenubox-application-menubar.*.GtkAccelLabel" style "mokomenubox-application-menubar-items"
 
 style "mokomenubox-filter-menubar-items" {
-    font_name = "Vera Sans 16"
+    font_name = "Vera Sans 8"
     fg[NORMAL] = "#ffffff"
     fg[PRELIGHT] = "#ffffff"
 }
diff -Nurd openmoko-standard/gtk-2.0/mokopanedwindow openmoko-standard-qvga/gtk-2.0/mokopanedwindow
--- openmoko-standard/gtk-2.0/mokopanedwindow	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokopanedwindow	2007-02-17 15:32:22.000000000 +0100
@@ -1,14 +1,14 @@
 style "mokopanedwindow-upper-enclosing" {
     #FIXME find out why this doesn't work with a pixmap engine
     bg_pixmap[NORMAL] = "mokopanedwindow-upper-enclosing.png"
-    MokoAlignment::padding = { 7, 7, 11, 11 }
+    MokoAlignment::padding = { 3, 3, 5, 5 }
 }
 widget "*.mokopanedwindow-upper-enclosing" style "mokopanedwindow-upper-enclosing"
 
 style "mokopanedwindow-lower-enclosing" {
     #FIXME find out why this doesn't work with a pixmap engine
     bg_pixmap[NORMAL] = "mokopanedwindow-lower-enclosing.png"
-    MokoAlignment::padding = { 7, 7, 11, 11 }
+    MokoAlignment::padding = { 3, 3, 5, 5 }
 }
 widget "*.mokopanedwindow-lower-enclosing" style "mokopanedwindow-lower-enclosing"
 
diff -Nurd openmoko-standard/gtk-2.0/mokostylusbutton openmoko-standard-qvga/gtk-2.0/mokostylusbutton
--- openmoko-standard/gtk-2.0/mokostylusbutton	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokostylusbutton	2007-02-17 15:59:28.000000000 +0100
@@ -28,7 +28,7 @@
 
     xthickness = 0
     ythickness = 0
-    MokoPixmapButton::size-request = { 0, 52, 0, 31 }
+    MokoPixmapButton::size-request = { 0, 26, 0, 16 }
     GtkButton::focus-line-width = 0
 }
 widget "*.mokostylusbutton-white" style "mokostylusbutton-white"
@@ -65,7 +65,7 @@
 
     xthickness = 0
     ythickness = 0
-    MokoPixmapButton::size-request = { 0, 52, 0, 31 }
+    MokoPixmapButton::size-request = { 0, 26, 0, 16 }
     GtkButton::focus-line-width = 0
 }
 widget "*.mokostylusbutton-black" style "mokostylusbutton-black"
diff -Nurd openmoko-standard/gtk-2.0/mokotoolbox openmoko-standard-qvga/gtk-2.0/mokotoolbox
--- openmoko-standard/gtk-2.0/mokotoolbox	2007-02-17 22:18:45.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokotoolbox	2007-02-17 15:39:14.000000000 +0100
@@ -1,21 +1,21 @@
 style "mokotoolbox-normal-mode" {
     bg_pixmap[NORMAL] = "openmoko-mokotoolbox-normal-mode-background.png"
-    MokoFixed::size-request = { 0, 480, 0, 52 }
-    MokoFixed::cargo-border = { 80, 480, 0, 52 }
+    MokoFixed::size-request = { 0, 240, 0, 26 }
+    MokoFixed::cargo-border = { 40, 240, 0, 26 }
 }
 widget "*.mokotoolbox-normal-mode" style "mokotoolbox-normal-mode"
 
 style "mokotoolbox-search-mode" {
     bg_pixmap[NORMAL] = "openmoko-mokotoolbox-search-mode-background.png"
-    MokoFixed::size-request = { 0, 480, 0, 52 }
-    MokoFixed::cargo-border = { 36, 340, 17, 40 }
+    MokoFixed::size-request = { 0, 240, 0, 26 }
+    MokoFixed::cargo-border = { 18, 170, 17, 20 }
 }
 widget "*.mokotoolbox-search-mode" style "mokotoolbox-search-mode"
 
 style "mokotoolbox-search-mode-focusout" {
     bg_pixmap[NORMAL] = "openmoko-mokotoolbox-search-mode-focusout-background.png"
-    MokoFixed::size-request = { 0, 480, 0, 52 }
-    MokoFixed::cargo-border = { 36, 340, 17, 40 }
+    MokoFixed::size-request = { 0, 240, 0, 26 }
+    MokoFixed::cargo-border = { 18, 170, 7, 20 }
 }
 widget "*.mokotoolbox-search-mode-focusout" style "mokotoolbox-search-mode-focusout"
 
@@ -47,7 +47,7 @@
         }
         
     }
-    MokoPixmapButton::size-request = { 0, 68, 0, 52 }
+    MokoPixmapButton::size-request = { 0, 34, 0, 26 }
     GtkButton::focus-line-width = 0
 }
 widget "*.mokotoolbox-search-button" style "mokotoolbox-normal-mode-search-button"
@@ -79,7 +79,7 @@
             stretch         = FALSE
         }
     }
-    MokoPixmapButton::size-request = { 0, 80, 0, 52 }
+    MokoPixmapButton::size-request = { 0, 40, 0, 26 }
     GtkButton::focus-line-width = 0
 }
 widget "*.mokotoolbox-back-button" style "mokotoolbox-search-mode-back-button"
@@ -139,13 +139,13 @@
 
     xthickness = 0
     ythickness = 0
-    MokoPixmapButton::size-request = { 0, 82, 0, 38 }
+    MokoPixmapButton::size-request = { 0, 41, 0, 19 }
     GtkButton::focus-line-width = 0
 }
 widget "*.mokotoolbox-action-button" style "mokotoolbox-action-button"
 
 style "mokotoolbox-action-button-label" {
-    font_name = "Vera Sans 10"
+    font_name = "Vera Sans 5"
     fg[NORMAL] = "#000000"
     fg[PRELIGHT] = "#ffffff"
 }
diff -Nurd openmoko-standard/gtk-2.0/mokotreeview openmoko-standard-qvga/gtk-2.0/mokotreeview
--- openmoko-standard/gtk-2.0/mokotreeview	2007-02-17 22:18:46.000000000 +0100
+++ openmoko-standard-qvga/gtk-2.0/mokotreeview	2007-02-17 15:39:24.000000000 +0100
@@ -53,14 +53,14 @@
 
 style "mokotreeview-button-label"
 {
-    font_name = "Vera Sans Bold 13"
+    font_name = "Vera Sans Bold 7"
     fg[NORMAL] = "#999999"
 }
 widget "*.MokoTreeView.*.GtkLabel" style "mokotreeview-button-label"
 
 style "mokotreeview-cellrenderer"
 {
-	font_name = "Vera Sans 30"
+	font_name = "Vera Sans 15"
     text[NORMAL] = "#ff0000"
     fg[NORMAL] = "#ff0000"
 }