diff --git a/openbox-3/bullet.xbm b/openbox-3/bullet.xbm
new file mode 100644
index 0000000..4e8300f
--- /dev/null
+++ b/openbox-3/bullet.xbm
@@ -0,0 +1,4 @@
+#define bullet_width 4
+#define bullet_height 8
+static unsigned char bullet_bits[] = {
+   0x00, 0x00, 0x01, 0x03, 0x07, 0x03, 0x01, 0x00 };
diff --git a/openbox-3/close.xbm b/openbox-3/close.xbm
new file mode 100644
index 0000000..ab7ff80
--- /dev/null
+++ b/openbox-3/close.xbm
@@ -0,0 +1,4 @@
+#define close_width 8
+#define close_height 8
+static unsigned char close_bits[] = {
+   0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3 };
diff --git a/openbox-3/desk.xbm b/openbox-3/desk.xbm
new file mode 100644
index 0000000..015976b
--- /dev/null
+++ b/openbox-3/desk.xbm
@@ -0,0 +1,4 @@
+#define desk_width 8
+#define desk_height 8
+static unsigned char desk_bits[] = {
+   0x04, 0x0e, 0x3f, 0x1e, 0x1c, 0x24, 0x40, 0x00 };
diff --git a/openbox-3/desk_toggled.xbm b/openbox-3/desk_toggled.xbm
new file mode 100644
index 0000000..abca780
--- /dev/null
+++ b/openbox-3/desk_toggled.xbm
@@ -0,0 +1,4 @@
+#define desk_toggled_width 8
+#define desk_toggled_height 8
+static unsigned char desk_toggled_bits[] = {
+   0xe7, 0xe7, 0xe7, 0x00, 0x00, 0xe7, 0xe7, 0xe7 };
diff --git a/openbox-3/iconify.xbm b/openbox-3/iconify.xbm
new file mode 100644
index 0000000..9a9743f
--- /dev/null
+++ b/openbox-3/iconify.xbm
@@ -0,0 +1,4 @@
+#define iconify_width 8
+#define iconify_height 8
+static unsigned char iconify_bits[] = {
+   0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00 };
diff --git a/openbox-3/max.xbm b/openbox-3/max.xbm
new file mode 100644
index 0000000..88bb9bd
--- /dev/null
+++ b/openbox-3/max.xbm
@@ -0,0 +1,4 @@
+#define max_width 8
+#define max_height 8
+static unsigned char max_bits[] = {
+   0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xff };
diff --git a/openbox-3/max_toggled.xbm b/openbox-3/max_toggled.xbm
new file mode 100644
index 0000000..41b5350
--- /dev/null
+++ b/openbox-3/max_toggled.xbm
@@ -0,0 +1,4 @@
+#define max_toggled_width 8
+#define max_toggled_height 8
+static unsigned char max_toggled_bits[] = {
+   0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xff, 0xff, 0x00 };
diff --git a/openbox-3/shade.xbm b/openbox-3/shade.xbm
new file mode 100644
index 0000000..ff774f8
--- /dev/null
+++ b/openbox-3/shade.xbm
@@ -0,0 +1,4 @@
+#define shade_width 8
+#define shade_height 8
+static unsigned char shade_bits[] = {
+   0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/openbox-3/shade_toggled.xbm b/openbox-3/shade_toggled.xbm
new file mode 100644
index 0000000..18e19f3
--- /dev/null
+++ b/openbox-3/shade_toggled.xbm
@@ -0,0 +1,4 @@
+#define shade_toggled_width 8
+#define shade_toggled_height 8
+static unsigned char shade_toggled_bits[] = {
+   0xff, 0xff, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00 };
diff --git a/openbox-3/themerc b/openbox-3/themerc
index 53bba6d..d5d3293 100644
--- a/openbox-3/themerc
+++ b/openbox-3/themerc
@@ -87,20 +87,33 @@ window.inactive.button.disabled.image.color: #888888
 
 
 # OSD
-osd.border.color: #2d2d2d
+osd.border.width: 1
+osd.border.color:  #a5a5a5
 
 osd.bg: flat solid
-osd.bg.color: #2d2d2d
+osd.bg.color: #dedede
 
 osd.label.bg: flat solid
-osd.label.bg.color: #2d2d2d
-osd.label.text.color: #dcdcdc
+osd.label.bg.color: #dedede
+osd.label.text.color: #222
 
 osd.hilight.bg: flat solid
 osd.hilight.bg.color: #d64937
 
 osd.unhilight.bg: flat solid
-osd.unhilight.bg.color: #888888
+osd.unhilight.bg.color: #dedede
+
+osd.button.unpressed.text.color: #222
+osd.button.pressed.text.color: #222
+osd.button.focused.text.color #222
+
+osd.button.pressed.box.color: #D3D3D4
+osd.button.focused.box.color: #bbb
+
+osd.button.*.bg: flat border 
+osd.button.pressed.bg: sunken solid
+osd.button.*.bg.color: #f0f0f0
+osd.button.*.border.color: #b2b2b2
 
 
 # Fonts
@@ -112,7 +125,8 @@ menu.title.text.font:shadow=n
 
 # Everything else
 border.width: 1
-padding.width: 4
+padding.width: 8
+padding.height: 4
 window.handle.width: 0
 window.client.padding.width: 0
 window.label.text.justify: center