diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp
index 6443dd55dc..5e14467334 100644
--- a/3d-viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_toolbar.cpp
@@ -52,26 +52,26 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar(void)
_("auto zoom"));
m_HToolBar->AddSeparator();
- m_HToolBar->AddTool(ID_ROTATE3D_X_POS, wxEmptyString, BITMAP(rotate_pos_X_xpm),
- _("Rotate X ->") );
-
m_HToolBar->AddTool(ID_ROTATE3D_X_NEG, wxEmptyString, BITMAP(rotate_neg_X_xpm),
_("Rotate X <-") );
+ m_HToolBar->AddTool(ID_ROTATE3D_X_POS, wxEmptyString, BITMAP(rotate_pos_X_xpm),
+ _("Rotate X ->") );
+
m_HToolBar->AddSeparator();
- m_HToolBar->AddTool(ID_ROTATE3D_Y_POS, wxEmptyString, BITMAP(rotate_pos_Y_xpm),
- _("Rotate Y ->") );
m_HToolBar->AddTool(ID_ROTATE3D_Y_NEG, wxEmptyString, BITMAP(rotate_neg_Y_xpm),
_("Rotate Y <-") );
+ m_HToolBar->AddTool(ID_ROTATE3D_Y_POS, wxEmptyString, BITMAP(rotate_pos_Y_xpm),
+ _("Rotate Y ->") );
m_HToolBar->AddSeparator();
- m_HToolBar->AddTool(ID_ROTATE3D_Z_POS, wxEmptyString, BITMAP(rotate_pos_Z_xpm),
- _("Rotate Z ->") );
-
m_HToolBar->AddTool(ID_ROTATE3D_Z_NEG, wxEmptyString, BITMAP(rotate_neg_Z_xpm),
_("Rotate Z <-") );
+ m_HToolBar->AddTool(ID_ROTATE3D_Z_POS, wxEmptyString, BITMAP(rotate_pos_Z_xpm),
+ _("Rotate Z ->") );
+
m_HToolBar->AddSeparator();
m_HToolBar->AddTool(ID_MOVE3D_LEFT, wxEmptyString, BITMAP(left_xpm),
_("Move left <-") );
diff --git a/3d-viewer/bitmaps3d/rotate+x.xpm b/3d-viewer/bitmaps3d/rotate+x.xpm
index 24c59bf733..00c14a0801 100644
--- a/3d-viewer/bitmaps3d/rotate+x.xpm
+++ b/3d-viewer/bitmaps3d/rotate+x.xpm
@@ -10,19 +10,19 @@ char *rotate_pos_X_xpm[] = {
". c #000080",
"# c #c0c0c0",
"a c #808080",
-"o c #008000",
+"o c #004000",
/* pixels */
"##oo###oo#######",
"###oo#oo########",
"####ooo#########",
"###oo#oo########",
-"##oo###oo...a###",
-"##.###...###.a##",
-"##..#.#######.##",
-"##...########.##",
-"##....#######.##",
-"##.....#####.a##",
-"###########a.###",
+"##oo...oo#######",
+"##a.####..###.##",
+"##.#######.#..##",
+"##.########...##",
+"##.#######....##",
+"##a.#####.....##",
+"###.a###########",
"################",
"################",
"################",
diff --git a/3d-viewer/bitmaps3d/rotate+y.xpm b/3d-viewer/bitmaps3d/rotate+y.xpm
index 2fbb7550f8..3c29b0e929 100644
--- a/3d-viewer/bitmaps3d/rotate+y.xpm
+++ b/3d-viewer/bitmaps3d/rotate+y.xpm
@@ -28,5 +28,5 @@ char *rotate_pos_Y_xpm[] = {
"################",
"################"
};
-#endif
+#endif
diff --git a/3d-viewer/bitmaps3d/rotate+z.xpm b/3d-viewer/bitmaps3d/rotate+z.xpm
index 1ee0b6cfdf..47f93b0e63 100644
--- a/3d-viewer/bitmaps3d/rotate+z.xpm
+++ b/3d-viewer/bitmaps3d/rotate+z.xpm
@@ -16,13 +16,13 @@ char *rotate_pos_Z_xpm[] = {
"######oo########",
"#####oo#########",
"####oo##########",
-"###oooooo...a###",
-"##.###..####.a##",
-"##..#.#######.##",
-"##...########.##",
-"##....#######.##",
-"##.....#####.a##",
-"###########a.###",
+"###oooooo#######",
+"##a.####..###.##",
+"##.#######.#..##",
+"##.########...##",
+"##.#######....##",
+"##a.#####.....##",
+"###.a###########",
"################",
"################",
"################",
diff --git a/3d-viewer/bitmaps3d/rotate-x.xpm b/3d-viewer/bitmaps3d/rotate-x.xpm
index 191c8de077..c56951ed0e 100644
--- a/3d-viewer/bitmaps3d/rotate-x.xpm
+++ b/3d-viewer/bitmaps3d/rotate-x.xpm
@@ -16,17 +16,17 @@ char *rotate_neg_X_xpm[] = {
"###oo#oo########",
"####ooo#########",
"###oo#oo########",
-"##oo...oo#######",
-"##a.####..###.##",
-"##.#######.#..##",
-"##.########...##",
-"##.#######....##",
-"##a.#####.....##",
-"###.a###########",
+"##oo###oo...a###",
+"##.###...###.a##",
+"##..#.#######.##",
+"##...########.##",
+"##....#######.##",
+"##.....#####.a##",
+"###########a.###",
"################",
"################",
"################",
"################"
};
-#endif
+#endif
diff --git a/3d-viewer/bitmaps3d/rotate-z.xpm b/3d-viewer/bitmaps3d/rotate-z.xpm
index 59fb5fb168..e2aedea8ab 100644
--- a/3d-viewer/bitmaps3d/rotate-z.xpm
+++ b/3d-viewer/bitmaps3d/rotate-z.xpm
@@ -16,17 +16,17 @@ char *rotate_neg_Z_xpm[] = {
"######oo########",
"#####oo#########",
"####oo##########",
-"###oooooo#######",
-"##a.####..###.##",
-"##.#######.#..##",
-"##.########...##",
-"##.#######....##",
-"##a.#####.....##",
-"###.a###########",
+"###oooooo...a###",
+"##.###..####.a##",
+"##..#.#######.##",
+"##...########.##",
+"##....#######.##",
+"##.....#####.a##",
+"###########a.###",
"################",
"################",
"################",
"################"
};
-#endif
+#endif
diff --git a/bitmaps/Rotate+.xpm b/bitmaps/Rotate+.xpm
index 9a4b05029c..782dc497d8 100644
--- a/bitmaps/Rotate+.xpm
+++ b/bitmaps/Rotate+.xpm
@@ -4,114 +4,117 @@ extern char *rotate_pos_xpm[];
#else
char * rotate_pos_xpm[] = {
-"16 16 93 2",
+"16 16 96 2",
" c None",
-". c #202020",
-"+ c #090909",
-"@ c #0C0C0C",
-"# c #CACACB",
-"$ c #3E3E3E",
-"% c #9B9B9B",
-"& c #010101",
-"* c #A8A8A9",
-"= c #FEFEFF",
-"- c #727275",
-"; c #646469",
-"> c #505057",
-", c #141416",
-"' c #4A4A4A",
-") c #F8F8FF",
-"! c #F1F1FF",
-"~ c #EBEBFF",
-"{ c #E0E0FA",
-"] c #A3A3BC",
-"^ c #484855",
-"/ c #171717",
-"( c #96969A",
-"_ c #C3C3CE",
-": c #E6E6FA",
-"< c #E4E4FF",
-"[ c #DDDDFF",
-"} c #D7D7FF",
-"| c #707089",
-"1 c #3B3B3D",
-"2 c #000000",
-"3 c #272727",
-"4 c #444444",
-"5 c #727272",
+". c #000000",
+"+ c #2A2A2B",
+"@ c #C5C5CB",
+"# c #313131",
+"$ c #141416",
+"% c #4D4D57",
+"& c #5F5F67",
+"* c #6F6F75",
+"= c #F8F8FF",
+"- c #A8A8A9",
+"; c #343434",
+"> c #444454",
+", c #9F9FBC",
+"' c #D9D9FA",
+") c #E4E4FF",
+"! c #EBEBFF",
+"~ c #F1F1FF",
+"{ c #FEFEFF",
+"] c #4A4A4A",
+"^ c #646464",
+"/ c #6C6C89",
+"( c #D0D0FF",
+"_ c #D7D7FF",
+": c #DDDDFF",
+"< c #E0E0FA",
+"[ c #BEBECE",
+"} c #92929A",
+"| c #3F3F3F",
+"1 c #9B9B9B",
+"2 c #46465C",
+"3 c #C9C9FF",
+"4 c #AEAECE",
+"5 c #44444C",
"6 c #4B4B4C",
-"7 c #46464C",
-"8 c #B3B3CE",
-"9 c #D0D0FF",
-"0 c #49495C",
-"a c #5B5B5B",
-"b c #5A5A76",
-"c c #656580",
-"d c #3B3B48",
-"e c #5C5C5C",
-"f c #313131",
-"g c #4B4B4B",
-"h c #494949",
-"i c #8C8C8C",
-"j c #212122",
-"k c #BCBCDF",
-"l c #8686AA",
-"m c #474747",
-"n c #8888B2",
-"o c #C9C9FF",
-"p c #B1B1D9",
-"q c #262627",
-"r c #595959",
-"s c #2F2F2F",
-"t c #40404C",
-"u c #686880",
-"v c #5A5A72",
-"w c #262626",
-"x c #4C4C64",
-"y c #A9A9C9",
-"z c #404048",
-"A c #0D0D0F",
-"B c #C0C0C5",
-"C c #323232",
-"D c #222222",
-"E c #4D4D4D",
-"F c #535353",
-"G c #28282A",
-"H c #737392",
-"I c #DFDFF9",
-"J c #BCBCCC",
-"K c #93939C",
-"L c #A1A1A2",
-"M c #383838",
-"N c #353535",
-"O c #4F4F5F",
-"P c #A3A3C1",
-"Q c #DADAFC",
-"R c #424242",
-"S c #6C6C6C",
-"T c #3D3D3F",
-"U c #595961",
-"V c #62626A",
-"W c #73737A",
-"X c #404040",
-"Y c #040404",
-"Z c #303031",
-"` c #989898",
-" . c #8F8F8F",
+"7 c #727272",
+"8 c #444444",
+"9 c #363636",
+"0 c #949494",
+"a c #3A3A3A",
+"b c #8282AA",
+"c c #B6B6DF",
+"d c #252526",
+"e c #939393",
+"f c #8F8F8F",
+"g c #494949",
+"h c #202020",
+"i c #2C2C2D",
+"j c #686868",
+"k c #3D3D48",
+"l c #686880",
+"m c #5D5D76",
+"n c #575772",
+"o c #656580",
+"p c #3E3E4C",
+"q c #6E6E6E",
+"r c #959595",
+"s c #1E1E1E",
+"t c #050505",
+"u c #828282",
+"v c #050507",
+"w c #B7B7D9",
+"x c #8C8CB2",
+"y c #272727",
+"z c #4D4D4D",
+"A c #929292",
+"B c #1F1F1F",
+"C c #C4C4C5",
+"D c #292929",
+"E c #2C2C2C",
+"F c #3A3A41",
+"G c #AEAEC9",
+"H c #4F4F64",
+"I c #6F6F6F",
+"J c #2F2F2F",
+"K c #A1A1A2",
+"L c #98989C",
+"M c #C1C1CC",
+"N c #E5E5F9",
+"O c #777792",
+"P c #545455",
+"Q c #424242",
+"R c #E1E1FC",
+"S c #A7A7C1",
+"T c #51515F",
+"U c #525252",
+"V c #101010",
+"W c #77777A",
+"X c #65656A",
+"Y c #5B5B61",
+"Z c #3D3D3F",
+"` c #5D5D5D",
+" . c #3E3E3E",
+".. c #989898",
+"+. c #3D3D3D",
+"@. c #404040",
" ",
-" . + ",
-" @ # $ % ",
-" & * = - ; > , ",
-" ' = = ) ! ~ { ] ^ ",
-" / * = ( _ : < [ } | 1 ",
-" 2 2 2 3 # 4 5 6 7 8 } 9 0 a ",
-"2 b c d e f g h i j k 9 l m ",
-"2 n o p q r s q t u v w ",
-" x o 9 y z A w B C D E E F ",
-" G H 9 } [ I J K ) L M % % % ",
-" N O P Q < ~ ! ) = R S ",
-" r T U V W ) L ' % ",
-" % % X B $ % % ",
-" Y Z ` % ",
-" .% "};
+" . + ",
+" . @ # ",
+" $ % & * = - ; ",
+" > , ' ) ! ~ = { ] ^ ",
+" / ( _ : < [ } = - | 1 ",
+" 2 3 ( 4 5 6 7 8 @ 9 0 a . . ",
+". b 3 c d e f g h i 0 j k l m . ",
+". n o p q r s t u e v w ( x y ",
+" | z z A B C D E F G _ ( H I ",
+" 1 1 J K { L M N ) : _ O P 1 ",
+" Q { { = ~ ! R S T U 1 1 ",
+" V K { W X Y Z ` r 1 1 ",
+" 1 .C 8 1 1 1 1 1 1 ",
+" ..+.@.1 1 1 1 ",
+" e ` "};
#endif
diff --git a/bitmaps/Rotate-.xpm b/bitmaps/Rotate-.xpm
index dfc73f3b02..56f8146dc0 100644
--- a/bitmaps/Rotate-.xpm
+++ b/bitmaps/Rotate-.xpm
@@ -4,117 +4,114 @@ extern char *rotate_neg_xpm[];
#else
char * rotate_neg_xpm[] = {
-"16 16 96 2",
+"16 16 93 2",
" c None",
-". c #000000",
-"+ c #2A2A2B",
-"@ c #C5C5CB",
-"# c #313131",
-"$ c #141416",
-"% c #4D4D57",
-"& c #5F5F67",
-"* c #6F6F75",
-"= c #F8F8FF",
-"- c #A8A8A9",
-"; c #343434",
-"> c #444454",
-", c #9F9FBC",
-"' c #D9D9FA",
-") c #E4E4FF",
-"! c #EBEBFF",
-"~ c #F1F1FF",
-"{ c #FEFEFF",
-"] c #4A4A4A",
-"^ c #646464",
-"/ c #6C6C89",
-"( c #D0D0FF",
-"_ c #D7D7FF",
-": c #DDDDFF",
-"< c #E0E0FA",
-"[ c #BEBECE",
-"} c #92929A",
-"| c #3F3F3F",
-"1 c #9B9B9B",
-"2 c #46465C",
-"3 c #C9C9FF",
-"4 c #AEAECE",
-"5 c #44444C",
+". c #202020",
+"+ c #090909",
+"@ c #0C0C0C",
+"# c #CACACB",
+"$ c #3E3E3E",
+"% c #9B9B9B",
+"& c #010101",
+"* c #A8A8A9",
+"= c #FEFEFF",
+"- c #727275",
+"; c #646469",
+"> c #505057",
+", c #141416",
+"' c #4A4A4A",
+") c #F8F8FF",
+"! c #F1F1FF",
+"~ c #EBEBFF",
+"{ c #E0E0FA",
+"] c #A3A3BC",
+"^ c #484855",
+"/ c #171717",
+"( c #96969A",
+"_ c #C3C3CE",
+": c #E6E6FA",
+"< c #E4E4FF",
+"[ c #DDDDFF",
+"} c #D7D7FF",
+"| c #707089",
+"1 c #3B3B3D",
+"2 c #000000",
+"3 c #272727",
+"4 c #444444",
+"5 c #727272",
"6 c #4B4B4C",
-"7 c #727272",
-"8 c #444444",
-"9 c #363636",
-"0 c #949494",
-"a c #3A3A3A",
-"b c #8282AA",
-"c c #B6B6DF",
-"d c #252526",
-"e c #939393",
-"f c #8F8F8F",
-"g c #494949",
-"h c #202020",
-"i c #2C2C2D",
-"j c #686868",
-"k c #3D3D48",
-"l c #686880",
-"m c #5D5D76",
-"n c #575772",
-"o c #656580",
-"p c #3E3E4C",
-"q c #6E6E6E",
-"r c #959595",
-"s c #1E1E1E",
-"t c #050505",
-"u c #828282",
-"v c #050507",
-"w c #B7B7D9",
-"x c #8C8CB2",
-"y c #272727",
-"z c #4D4D4D",
-"A c #929292",
-"B c #1F1F1F",
-"C c #C4C4C5",
-"D c #292929",
-"E c #2C2C2C",
-"F c #3A3A41",
-"G c #AEAEC9",
-"H c #4F4F64",
-"I c #6F6F6F",
-"J c #2F2F2F",
-"K c #A1A1A2",
-"L c #98989C",
-"M c #C1C1CC",
-"N c #E5E5F9",
-"O c #777792",
-"P c #545455",
-"Q c #424242",
-"R c #E1E1FC",
-"S c #A7A7C1",
-"T c #51515F",
-"U c #525252",
-"V c #101010",
-"W c #77777A",
-"X c #65656A",
-"Y c #5B5B61",
-"Z c #3D3D3F",
-"` c #5D5D5D",
-" . c #3E3E3E",
-".. c #989898",
-"+. c #3D3D3D",
-"@. c #404040",
+"7 c #46464C",
+"8 c #B3B3CE",
+"9 c #D0D0FF",
+"0 c #49495C",
+"a c #5B5B5B",
+"b c #5A5A76",
+"c c #656580",
+"d c #3B3B48",
+"e c #5C5C5C",
+"f c #313131",
+"g c #4B4B4B",
+"h c #494949",
+"i c #8C8C8C",
+"j c #212122",
+"k c #BCBCDF",
+"l c #8686AA",
+"m c #474747",
+"n c #8888B2",
+"o c #C9C9FF",
+"p c #B1B1D9",
+"q c #262627",
+"r c #595959",
+"s c #2F2F2F",
+"t c #40404C",
+"u c #686880",
+"v c #5A5A72",
+"w c #262626",
+"x c #4C4C64",
+"y c #A9A9C9",
+"z c #404048",
+"A c #0D0D0F",
+"B c #C0C0C5",
+"C c #323232",
+"D c #222222",
+"E c #4D4D4D",
+"F c #535353",
+"G c #28282A",
+"H c #737392",
+"I c #DFDFF9",
+"J c #BCBCCC",
+"K c #93939C",
+"L c #A1A1A2",
+"M c #383838",
+"N c #353535",
+"O c #4F4F5F",
+"P c #A3A3C1",
+"Q c #DADAFC",
+"R c #424242",
+"S c #6C6C6C",
+"T c #3D3D3F",
+"U c #595961",
+"V c #62626A",
+"W c #73737A",
+"X c #404040",
+"Y c #040404",
+"Z c #303031",
+"` c #989898",
+" . c #8F8F8F",
" ",
-" . + ",
-" . @ # ",
-" $ % & * = - ; ",
-" > , ' ) ! ~ = { ] ^ ",
-" / ( _ : < [ } = - | 1 ",
-" 2 3 ( 4 5 6 7 8 @ 9 0 a . . ",
-". b 3 c d e f g h i 0 j k l m . ",
-". n o p q r s t u e v w ( x y ",
-" | z z A B C D E F G _ ( H I ",
-" 1 1 J K { L M N ) : _ O P 1 ",
-" Q { { = ~ ! R S T U 1 1 ",
-" V K { W X Y Z ` r 1 1 ",
-" 1 .C 8 1 1 1 1 1 1 ",
-" ..+.@.1 1 1 1 ",
-" e ` "};
+" . + ",
+" @ # $ % ",
+" & * = - ; > , ",
+" ' = = ) ! ~ { ] ^ ",
+" / * = ( _ : < [ } | 1 ",
+" 2 2 2 3 # 4 5 6 7 8 } 9 0 a ",
+"2 b c d e f g h i j k 9 l m ",
+"2 n o p q r s q t u v w ",
+" x o 9 y z A w B C D E E F ",
+" G H 9 } [ I J K ) L M % % % ",
+" N O P Q < ~ ! ) = R S ",
+" r T U V W ) L ' % ",
+" % % X B $ % % ",
+" Y Z ` % ",
+" .% "};
#endif
diff --git a/pcbnew/bitmaps/Rotate_Module+.xpm b/pcbnew/bitmaps/Rotate_Module+.xpm
index 5e068f04bb..f676d4bcfe 100644
--- a/pcbnew/bitmaps/Rotate_Module+.xpm
+++ b/pcbnew/bitmaps/Rotate_Module+.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * rotate_module_pos_xpm[] = {
-"16 16 89 1",
+"16 16 77 1",
" c None",
". c #000000",
"+ c #C0C0C0",
@@ -9,100 +9,88 @@ static char * rotate_module_pos_xpm[] = {
"$ c #FFFFFF",
"% c #F5F4FF",
"& c #EBEAFF",
-"* c #CD2C2C",
-"= c #F5F5FF",
-"- c #EBEBFF",
-"; c #C4C4DF",
-"> c #B62626",
-", c #F6F5FF",
-"' c #ECEBFF",
-") c #B9B8D1",
-"! c #36363A",
-"~ c #717172",
-"{ c #ECECFF",
-"] c #AAAAC0",
-"^ c #505052",
-"/ c #EEEEEF",
-"( c #FBFBFC",
-"_ c #EEEEF5",
-": c #E4E4F2",
-"< c #C9C9DB",
-"[ c #9393A5",
-"} c #3D3D46",
-"| c #E3E2FF",
-"1 c #8F8FA9",
-"2 c #585859",
-"3 c #F3F3F4",
+"* c #F5F5FF",
+"= c #EBEBFF",
+"- c #E1E1FF",
+"; c #D22D2D",
+"> c #F6F5FF",
+", c #ECEBFF",
+"' c #E2E1FF",
+") c #D8D7FF",
+"! c #1E1E1F",
+"~ c #EBEBFE",
+"{ c #A4A4BA",
+"] c #595969",
+"^ c #636272",
+"/ c #616169",
+"( c #6B676D",
+"_ c #B9B9BE",
+": c #9C9C9D",
+"< c #090909",
+"[ c #3C3B44",
+"} c #86869F",
+"| c #DDDDFF",
+"1 c #E4E4FF",
+"2 c #F1F1FF",
+"3 c #F8F8FF",
"4 c #FEFEFF",
-"5 c #F8F8FF",
-"6 c #F1F1FF",
-"7 c #E4E4FF",
-"8 c #D8D8FA",
-"9 c #4A4A58",
-"0 c #D9D8FF",
-"a c #CFCEFF",
-"b c #8180A7",
-"c c #323234",
-"d c #838384",
-"e c #19191A",
-"f c #2B2B2D",
-"g c #37373C",
-"h c #6E6E7B",
-"i c #D3D3F4",
-"j c #A7A7C7",
-"k c #616077",
-"l c #5C5B77",
-"m c #ADABEB",
-"n c #8685C1",
-"o c #6D1616",
-"p c #7C7C90",
-"q c #D1D1F9",
-"r c #060608",
-"s c #5B5B73",
-"t c #4C4C5D",
-"u c #686795",
-"v c #AFADFF",
-"w c #831C1C",
-"x c #8989AE",
-"y c #C2C2EE",
-"z c #1D1D22",
-"A c #252527",
-"B c #070707",
-"C c #595971",
-"D c #D0D0FF",
-"E c #D3D3FA",
-"F c #A7A7C1",
-"G c #9C9CAE",
-"H c #8F8F9B",
-"I c #B6B6C1",
-"J c #BEBEC3",
-"K c #191919",
-"L c #020202",
-"M c #71718B",
-"N c #D7D7FF",
-"O c #DDDDFF",
-"P c #B8B8B9",
-"Q c #141418",
-"R c #44444F",
-"S c #63636F",
-"T c #6A6A73",
-"U c #AAAAB4",
-"V c #B1B1B6",
-"W c #111111",
-"X c #1F1F21",
+"5 c #9F9FA0",
+"6 c #71718A",
+"7 c #D7D7FF",
+"8 c #D3D3F4",
+"9 c #ABABBF",
+"0 c #A1A1AF",
+"a c #96969F",
+"b c #C9C9CF",
+"c c #B6B6B7",
+"d c #131313",
+"e c #B02525",
+"f c #A6A6CC",
+"g c #B7B7D9",
+"h c #23232C",
+"i c #494869",
+"j c #691616",
+"k c #2F2F30",
+"l c #030303",
+"m c #962020",
+"n c #67677E",
+"o c #3F3F4B",
+"p c #7F7EB6",
+"q c #A1A0EC",
+"r c #7A1919",
+"s c #9494B0",
+"t c #B8B8E2",
+"u c #383838",
+"v c #69696C",
+"w c #1C1C1D",
+"x c #2E2E32",
+"y c #393940",
+"z c #777789",
+"A c #D4D4FC",
+"B c #8888A7",
+"C c #616161",
+"D c #F7F7F8",
+"E c #CECEF4",
+"F c #353541",
+"G c #EBEBF9",
+"H c #E0E0F3",
+"I c #BFBFD6",
+"J c #8B8BA0",
+"K c #2D2D36",
+"L c #67676A",
" .. .. ",
" .+..@. ",
-" #.$$%&.* ",
-" #.$=-;.> ",
-" .,')!~. ",
-" #.{]^/(_:<[} ",
-" #.|123456-789 ",
-" .0abcdefghij.",
-" #.klmn.o .pqr",
-" #.stuv.w. ...",
-" .xyz.. AB ",
-" CDEFGHIJK ",
-" LMNO7-65P. ",
-" .QRSTUVW ",
-" XL ",
-" . "};
+" #.$$%&.# ",
+" #.$*=-.; ",
+" .>,'). !. ",
+" #.~{]^/(_:< ",
+" #.[}|1=2345. ",
+" .67890abcd ",
+" e.fghi.jkl ",
+" m.nopq.r. ...",
+" ...... .st.",
+" uvwxyzAB.",
+" CD32=1|EF ",
+" .CD3GHIJK ",
+" .uL... ",
+" .. "};
diff --git a/pcbnew/bitmaps/Rotate_Module-.xpm b/pcbnew/bitmaps/Rotate_Module-.xpm
index 596ff8725c..019d52192d 100644
--- a/pcbnew/bitmaps/Rotate_Module-.xpm
+++ b/pcbnew/bitmaps/Rotate_Module-.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * rotate_module_neg_xpm[] = {
-"16 16 77 1",
+"16 16 89 1",
" c None",
". c #000000",
"+ c #C0C0C0",
@@ -9,88 +9,100 @@ static char * rotate_module_neg_xpm[] = {
"$ c #FFFFFF",
"% c #F5F4FF",
"& c #EBEAFF",
-"* c #F5F5FF",
-"= c #EBEBFF",
-"- c #E1E1FF",
-"; c #D22D2D",
-"> c #F6F5FF",
-", c #ECEBFF",
-"' c #E2E1FF",
-") c #D8D7FF",
-"! c #1E1E1F",
-"~ c #EBEBFE",
-"{ c #A4A4BA",
-"] c #595969",
-"^ c #636272",
-"/ c #616169",
-"( c #6B676D",
-"_ c #B9B9BE",
-": c #9C9C9D",
-"< c #090909",
-"[ c #3C3B44",
-"} c #86869F",
-"| c #DDDDFF",
-"1 c #E4E4FF",
-"2 c #F1F1FF",
-"3 c #F8F8FF",
+"* c #CD2C2C",
+"= c #F5F5FF",
+"- c #EBEBFF",
+"; c #C4C4DF",
+"> c #B62626",
+", c #F6F5FF",
+"' c #ECEBFF",
+") c #B9B8D1",
+"! c #36363A",
+"~ c #717172",
+"{ c #ECECFF",
+"] c #AAAAC0",
+"^ c #505052",
+"/ c #EEEEEF",
+"( c #FBFBFC",
+"_ c #EEEEF5",
+": c #E4E4F2",
+"< c #C9C9DB",
+"[ c #9393A5",
+"} c #3D3D46",
+"| c #E3E2FF",
+"1 c #8F8FA9",
+"2 c #585859",
+"3 c #F3F3F4",
"4 c #FEFEFF",
-"5 c #9F9FA0",
-"6 c #71718A",
-"7 c #D7D7FF",
-"8 c #D3D3F4",
-"9 c #ABABBF",
-"0 c #A1A1AF",
-"a c #96969F",
-"b c #C9C9CF",
-"c c #B6B6B7",
-"d c #131313",
-"e c #B02525",
-"f c #A6A6CC",
-"g c #B7B7D9",
-"h c #23232C",
-"i c #494869",
-"j c #691616",
-"k c #2F2F30",
-"l c #030303",
-"m c #962020",
-"n c #67677E",
-"o c #3F3F4B",
-"p c #7F7EB6",
-"q c #A1A0EC",
-"r c #7A1919",
-"s c #9494B0",
-"t c #B8B8E2",
-"u c #383838",
-"v c #69696C",
-"w c #1C1C1D",
-"x c #2E2E32",
-"y c #393940",
-"z c #777789",
-"A c #D4D4FC",
-"B c #8888A7",
-"C c #616161",
-"D c #F7F7F8",
-"E c #CECEF4",
-"F c #353541",
-"G c #EBEBF9",
-"H c #E0E0F3",
-"I c #BFBFD6",
-"J c #8B8BA0",
-"K c #2D2D36",
-"L c #67676A",
+"5 c #F8F8FF",
+"6 c #F1F1FF",
+"7 c #E4E4FF",
+"8 c #D8D8FA",
+"9 c #4A4A58",
+"0 c #D9D8FF",
+"a c #CFCEFF",
+"b c #8180A7",
+"c c #323234",
+"d c #838384",
+"e c #19191A",
+"f c #2B2B2D",
+"g c #37373C",
+"h c #6E6E7B",
+"i c #D3D3F4",
+"j c #A7A7C7",
+"k c #616077",
+"l c #5C5B77",
+"m c #ADABEB",
+"n c #8685C1",
+"o c #6D1616",
+"p c #7C7C90",
+"q c #D1D1F9",
+"r c #060608",
+"s c #5B5B73",
+"t c #4C4C5D",
+"u c #686795",
+"v c #AFADFF",
+"w c #831C1C",
+"x c #8989AE",
+"y c #C2C2EE",
+"z c #1D1D22",
+"A c #252527",
+"B c #070707",
+"C c #595971",
+"D c #D0D0FF",
+"E c #D3D3FA",
+"F c #A7A7C1",
+"G c #9C9CAE",
+"H c #8F8F9B",
+"I c #B6B6C1",
+"J c #BEBEC3",
+"K c #191919",
+"L c #020202",
+"M c #71718B",
+"N c #D7D7FF",
+"O c #DDDDFF",
+"P c #B8B8B9",
+"Q c #141418",
+"R c #44444F",
+"S c #63636F",
+"T c #6A6A73",
+"U c #AAAAB4",
+"V c #B1B1B6",
+"W c #111111",
+"X c #1F1F21",
" .. .. ",
" .+..@. ",
-" #.$$%&.# ",
-" #.$*=-.; ",
-" .>,'). !. ",
-" #.~{]^/(_:< ",
-" #.[}|1=2345. ",
-" .67890abcd ",
-" e.fghi.jkl ",
-" m.nopq.r. ...",
-" ...... .st.",
-" uvwxyzAB.",
-" CD32=1|EF ",
-" .CD3GHIJK ",
-" .uL... ",
-" .. "};
+" #.$$%&.* ",
+" #.$=-;.> ",
+" .,')!~. ",
+" #.{]^/(_:<[} ",
+" #.|123456-789 ",
+" .0abcdefghij.",
+" #.klmn.o .pqr",
+" #.stuv.w. ...",
+" .xyz.. AB ",
+" CDEFGHIJK ",
+" LMNO7-65P. ",
+" .QRSTUVW ",
+" XL ",
+" . "};
diff --git a/share/zoom.cpp b/share/zoom.cpp
index 21bf816feb..e777643445 100644
--- a/share/zoom.cpp
+++ b/share/zoom.cpp
@@ -343,8 +343,8 @@ grid_list_struct grid_list_schematic[] =
ADD_MENUITEM(MasterMenu, ID_POPUP_ZOOM_CENTER, _("Center"), zoom_center_xpm);
- ADD_MENUITEM(MasterMenu, ID_POPUP_ZOOM_PLUS, _("Zoom +"), zoom_out_xpm);
- ADD_MENUITEM(MasterMenu, ID_POPUP_ZOOM_MOINS, _("Zoom -"), zoom_in_xpm);
+ ADD_MENUITEM(MasterMenu, ID_POPUP_ZOOM_PLUS, _("Zoom +"), zoom_in_xpm);
+ ADD_MENUITEM(MasterMenu, ID_POPUP_ZOOM_MOINS, _("Zoom -"), zoom_out_xpm);
wxMenu * zoom_choice = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU(MasterMenu, zoom_choice,
@@ -439,7 +439,3 @@ int id = event.GetId();
break;
}
}
-
-
-
-