diff --git a/src/frame.c b/src/frame.c
index 47d5785d0939c4fe78d96061611626f4411a407c..68faec427e78774b1d7dd361b3ac9476ea65f837 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -303,9 +303,9 @@ frameCreateTitlePixmap (Client * c, int state, int left, int right, XfwmPixmap *
 
     if (w1 > 0)
     {
-        fillRectangle (clientGetXDisplay (c), screen_info->screen, pm->pixmap, screen_info->title[TITLE_2][state].pixmap,
+        fillRectangle (clientGetXDisplay (c), screen_info->screen, pm->pixmap, screen_info->title[TITLE_1][state].pixmap,
             0, 0, w1, frameTop (c));
-        fillRectangle (clientGetXDisplay (c), screen_info->screen, pm->mask, screen_info->title[TITLE_2][state].mask, 0, 0,
+        fillRectangle (clientGetXDisplay (c), screen_info->screen, pm->mask, screen_info->title[TITLE_1][state].mask, 0, 0,
             w1, frameTop (c));
         x = x + w1;
     }
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index 27bb2ada436edaa1867b827e83876e07d75d78b7..70ab40182f72a172ca38f619d3a8c9038498c541 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 08a29c375bb421ccd1c193ddf40367c87dcd3937..0f7b4f14ff253fddae9e0e58fc1bd462175eee18 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 08a29c375bb421ccd1c193ddf40367c87dcd3937..0f7b4f14ff253fddae9e0e58fc1bd462175eee18 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index e051fa69b42a4064940b6d3da460aedc7f9934c4..a166c3464508d55ddd2409fc21373d67cb01ce65 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index e051fa69b42a4064940b6d3da460aedc7f9934c4..a166c3464508d55ddd2409fc21373d67cb01ce65 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ