diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index cfd99a5b67c4e2cc21aad86bd2dd48d87b924029..64d049dec17181f828b37cd3a01ad9eaf39c0374 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.71 2004-08-16 17:52:59 remacle Exp $
+// $Id: Geom.cpp,v 1.72 2004-10-15 18:36:04 geuzaine Exp $
 //
 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
 //
@@ -94,7 +94,7 @@ void Draw_Geo_Point(void *a, void *b)
 
   if(CTX.geom.points_num) {
     sprintf(Num, "%d", v->Num);
-    double offset = 0.5 * (CTX.geom.point_size + CTX.gl_fontsize) * CTX.pixel_equiv_x;
+    double offset = (0.5 * CTX.geom.point_size + 0.3 * CTX.gl_fontsize) * CTX.pixel_equiv_x;
     glRasterPos3d(v->Pos.X + offset / CTX.s[0],
                   v->Pos.Y + offset / CTX.s[1],
                   v->Pos.Z + offset / CTX.s[2]);
@@ -207,7 +207,7 @@ void Draw_Curve(void *a, void *b)
   if(CTX.geom.lines_num) {
     v = InterpolateCurve(c, 0.5, 0);
     sprintf(Num, "%d", c->Num);
-    double offset = 0.5 * (CTX.geom.line_width + CTX.gl_fontsize) * CTX.pixel_equiv_x;
+    double offset = (0.5 * CTX.geom.line_width + 0.3 * CTX.gl_fontsize) * CTX.pixel_equiv_x;
     glRasterPos3d(v.Pos.X + offset / CTX.s[0],
                   v.Pos.Y + offset / CTX.s[1],
                   v.Pos.Z + offset / CTX.s[2]);
@@ -498,7 +498,7 @@ void Draw_Plane_Surface(Surface * s)
       List_Read(s->Orientations, 0, &vv1);
       List_Read(s->Orientations, 1, &vv2);
       sprintf(Num, "%d", s->Num);
-      double offset = 0.5 * CTX.gl_fontsize * CTX.pixel_equiv_x;
+      double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x;
       glRasterPos3d((vv2.Pos.X + vv1.Pos.X) / 2. + offset / CTX.s[0],
                     (vv2.Pos.Y + vv1.Pos.Y) / 2. + offset / CTX.s[1],
                     (vv2.Pos.Z + vv1.Pos.Z) / 2. + offset / CTX.s[2]);
@@ -573,7 +573,7 @@ void Draw_NonPlane_Surface(Surface * s)
     Vertex v = InterpolateSurface(s, 0.5, 0.5, 0, 0);
     char Num[100];
     sprintf(Num, "%d", s->Num);
-    double offset = 0.5 * CTX.gl_fontsize * CTX.pixel_equiv_x;
+    double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x;
     glRasterPos3d(v.Pos.X + offset / CTX.s[0],
                   v.Pos.Y + offset / CTX.s[1],
                   v.Pos.Z + offset / CTX.s[2]);
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index 10d97acb326c73a6492346900e850dcde61aabfd..e6a573983eb3e9952e763c71ddbf9a9aa32fd4b1 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.110 2004-10-15 02:30:51 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.111 2004-10-15 18:36:04 geuzaine Exp $
 //
 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
 //
@@ -170,7 +170,7 @@ void Draw_Mesh(Mesh * M)
     glVertex3d(CTX.min[0], CTX.max[1], CTX.max[2]);
     glEnd();
     char label[256];
-    double offset = 0.5 * CTX.gl_fontsize * CTX.pixel_equiv_x;
+    double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x;
     glRasterPos3d(CTX.min[0] + offset / CTX.s[0], 
 		  CTX.min[1] + offset / CTX.s[0], 
 		  CTX.min[2] + offset / CTX.s[0]);
@@ -426,7 +426,7 @@ void Draw_Mesh_Point(int num, double x, double y, double z, int degree, int visi
   if(CTX.mesh.points_num) {
     char Num[100];
     sprintf(Num, "%d", num);
-    double offset = 0.5 * (CTX.mesh.point_size + CTX.gl_fontsize) * CTX.pixel_equiv_x;
+    double offset = 0.3 * (CTX.mesh.point_size + CTX.gl_fontsize) * CTX.pixel_equiv_x;
     glRasterPos3d(x + offset / CTX.s[0],
                   y + offset / CTX.s[1],
                   z + offset / CTX.s[2]);
@@ -510,7 +510,7 @@ void Draw_Mesh_Line(void *a, void *b)
 
   if(CTX.mesh.lines_num) {
     sprintf(Num, "%d", s->Num);
-    double offset = 0.5 * (CTX.mesh.line_width + CTX.gl_fontsize) * CTX.pixel_equiv_x;
+    double offset = 0.3 * (CTX.mesh.line_width + CTX.gl_fontsize) * CTX.pixel_equiv_x;
     glRasterPos3d(Xc + offset / CTX.s[0],
                   Yc + offset / CTX.s[1],
                   Zc + offset / CTX.s[2]);
diff --git a/Plugin/StructuralSolver.cpp b/Plugin/StructuralSolver.cpp
index 214ea919282b46907bb824cd8a657e55f045b868..0d2c0a5d3c6157a0fabd5cc02aa8a1c96ac0c4e0 100644
--- a/Plugin/StructuralSolver.cpp
+++ b/Plugin/StructuralSolver.cpp
@@ -821,7 +821,7 @@ bool StructuralSolver :: GL_enhancePoint ( Vertex *v)
 		  dv[1] += dir2[1] * it->second.val[1];
 		}
 
-	      const double offset = 0.5 * CTX.gl_fontsize * CTX.pixel_equiv_x;
+	      const double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x;
 	      const double l = sqrt (dv[0]*dv[0]+dv[1]*dv[1]);
 	      const double kk = (CTX.max[0]-CTX.min[0])*.1*l / (MAX_FORCE);
 	      if (l != 0.0)