Index: src/Screen.cc
===================================================================
RCS file: /cvsroot/blackboxwm/blackbox/src/Screen.cc,v
retrieving revision 1.305
diff -p -u -r1.305 Screen.cc
--- src/Screen.cc	15 Apr 2005 15:09:29 -0000	1.305
+++ src/Screen.cc	16 Jun 2005 08:54:12 -0000
@@ -1896,9 +1896,9 @@ void BScreen::buttonPressEvent(const XBu
   */
   _blackbox->setActiveScreen(this);
 
-  if (event->button == 2) {
+  if (event->button == 3) {
     _workspacemenu->popup(event->x_root, event->y_root);
-  } else if (event->button == 3) {
+  } else if (event->button == 2) {
     _blackbox->checkMenu();
     _rootmenu->popup(event->x_root, event->y_root);
   } else if (event->button == 4 &&
Index: src/ScreenResource.cc
===================================================================
RCS file: /cvsroot/blackboxwm/blackbox/src/ScreenResource.cc,v
retrieving revision 1.13
diff -p -u -r1.13 ScreenResource.cc
--- src/ScreenResource.cc	13 Apr 2005 05:54:08 -0000	1.13
+++ src/ScreenResource.cc	16 Jun 2005 08:54:13 -0000
@@ -37,8 +37,8 @@
 static const int iconify_width  = 9;
 static const int iconify_height = 9;
 static const unsigned char iconify_bits[] =
-  { 0x00, 0x00, 0x82, 0x00, 0xc6, 0x00, 0x6c, 0x00, 0x38,
-    0x00, 0x10, 0x00, 0x00, 0x00, 0xff, 0x01, 0xff, 0x01 };
+  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xff, 0x01, 0xff, 0x01 };
 
 static const int maximize_width  = 9;
 static const int maximize_height = 9;
@@ -399,7 +399,7 @@ void ScreenResource::loadStyle(BScreen* 
     ((std::max(_windowStyle.focus.title.borderWidth(),
                _windowStyle.unfocus.title.borderWidth()) +
       _windowStyle.title_margin) * 2);
-  _windowStyle.grip_width = (_windowStyle.button_width * 2);
+  _windowStyle.grip_width = (_windowStyle.button_width * 1.4);
   _windowStyle.handle_height +=
     (std::max(_windowStyle.focus.handle.borderWidth(),
               _windowStyle.unfocus.handle.borderWidth()) * 2);
Index: src/main.cc
===================================================================
RCS file: /cvsroot/blackboxwm/blackbox/src/main.cc,v
retrieving revision 1.31
diff -p -u -r1.31 main.cc
--- src/main.cc	3 Jan 2005 09:42:57 -0000	1.31
+++ src/main.cc	16 Jun 2005 08:54:13 -0000
@@ -127,7 +127,7 @@ int main(int argc, char **argv) {
 #endif // __EMX__
 
   if (rc_file.empty())
-    rc_file = "~/.blackboxrc";
+    rc_file = "~/.config/blackbox/blackboxrc";
   rc_file = bt::expandTilde(rc_file);
 
 #if defined(PRINT_SIZES)