diff --git a/designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java
index 96371eeab..b78776c3c 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java
@@ -60,7 +60,7 @@ public class FunctionComboBox extends UIComboBox {
 
 			if (value instanceof DataFunction) {
 				DataFunction function = (DataFunction) value;
-				this.setText(DataCoreUtils.getFunctionDisplayName(function));
+				this.setText(" " + DataCoreUtils.getFunctionDisplayName(function));
 			}
 
 			return this;
diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
index 071820e03..bed54db9d 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
@@ -67,9 +67,9 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
         g2d.setColor(linecolor);
         if (!comboBox.isPopupVisible()) {
-            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
         } else {
-            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.ARC, UIConstants.ARC);
             g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1);
         }
     }