diff --git a/src/diagrams/classDiagram/classRenderer.js b/src/diagrams/classDiagram/classRenderer.js
index d5e144774..caf9bfebc 100644
--- a/src/diagrams/classDiagram/classRenderer.js
+++ b/src/diagrams/classDiagram/classRenderer.js
@@ -200,8 +200,8 @@ var drawEdge = function (elem, path, relation) {
       .attr('class', 'box')
       .attr('x', bounds.x - conf.padding / 2)
       .attr('y', bounds.y - conf.padding / 2)
-      .attr('width', bounds.width + 2 * conf.padding / 2)
-      .attr('height', bounds.height + 2 * conf.padding / 2)
+      .attr('width', bounds.width + conf.padding)
+      .attr('height', bounds.height + conf.padding)
   }
 
   edgeCount++
diff --git a/src/less/default/classDiagram.less b/src/less/default/classDiagram.less
index 94ff27b8d..b69e1f5b3 100644
--- a/src/less/default/classDiagram.less
+++ b/src/less/default/classDiagram.less
@@ -24,6 +24,7 @@ svg .classLabel .box {
 
 svg .classLabel .label {
   fill: @nodeBorder;
+  font-size: 10px;
 }
 
 .relation {