diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp
index 60fa2914c4..e141c80a4f 100644
--- a/src/Base/UnitsSchemaInternal.cpp
+++ b/src/Base/UnitsSchemaInternal.cpp
@@ -247,6 +247,14 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact
         unitString = QString::fromLatin1("W/m^2");
         factor = 1.0;
     }
+    else if (unit == Unit::ElectricCharge) {
+        unitString = QString::fromLatin1("C");
+        factor = 1.0;
+    }
+    else if (unit == Unit::MagneticFluxDensity) {
+        unitString = QString::fromLatin1("T");
+        factor = 1.0;
+    }
     else if (unit == Unit::ElectricalCapacitance) {
         if (UnitValue < 1e-15) {
             unitString = QString::fromLatin1("pF");
@@ -257,7 +265,7 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact
             factor = 1e-15;
         }
         else if (UnitValue < 1e-9) {
-            unitString = QString::fromUtf8("µF");
+            unitString = QString::fromUtf8("\xC2\xB5""F"); // \x reads everything to the end, therefore split
             factor = 1e-12;
         }
         else if (UnitValue < 1e-6) {
@@ -275,7 +283,7 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact
             factor = 1e-3;
         }
         else if (UnitValue < 1e3) {
-            unitString = QString::fromUtf8("µH");
+            unitString = QString::fromUtf8("\xC2\xB5H");
             factor = 1.0;
         }
         else if (UnitValue < 1e6) {
diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp
index 1839fb7837..8893031e6f 100644
--- a/src/Base/UnitsSchemaMKS.cpp
+++ b/src/Base/UnitsSchemaMKS.cpp
@@ -228,7 +228,7 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q
             factor = 1e-15;
         }
         else if (UnitValue < 1e-9) {
-            unitString = QString::fromUtf8("µF");
+            unitString = QString::fromUtf8("\xC2\xB5""F"); // \x reads everything to the end, therefore split
             factor = 1e-12;
         }
         else if (UnitValue < 1e-6) {
@@ -246,7 +246,7 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q
             factor = 1e-3;
         }
         else if (UnitValue < 1e-3) {
-            unitString = QString::fromUtf8("µH");
+            unitString = QString::fromUtf8("\xC2\xB5H");
             factor = 1.0;
         }
         else if (UnitValue < 1.0) {
diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp
index 6d28ced633..86b34b0d18 100644
--- a/src/Gui/DlgUnitsCalculatorImp.cpp
+++ b/src/Gui/DlgUnitsCalculatorImp.cpp
@@ -66,14 +66,16 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl )
     ui->ValueInput->setText(QString::fromLatin1("1 cm"));
     ui->UnitInput->setText(QString::fromLatin1("in"));
 
-    units << Base::Unit::Length << Base::Unit::Mass << Base::Unit::Angle << Base::Unit::Density
-          << Base::Unit::Area << Base::Unit::Volume << Base::Unit::TimeSpan << Base::Unit::Frequency
-          << Base::Unit::Velocity << Base::Unit::Acceleration << Base::Unit::Temperature
+    units << Base::Unit::Acceleration << Base::Unit::AmountOfSubstance << Base::Unit::Angle
+          << Base::Unit::Area << Base::Unit::Density << Base::Unit::ElectricalCapacitance
+          << Base::Unit::ElectricalInductance << Base::Unit::ElectricCharge
           << Base::Unit::ElectricCurrent << Base::Unit::ElectricPotential
-          << Base::Unit::AmountOfSubstance << Base::Unit::LuminousIntensity << Base::Unit::Stress
-          << Base::Unit::Pressure << Base::Unit::Force << Base::Unit::Work << Base::Unit::Power
-          << Base::Unit::ThermalConductivity << Base::Unit::ThermalExpansionCoefficient
-          << Base::Unit::SpecificHeat << Base::Unit::ThermalTransferCoefficient << Base::Unit::HeatFlux;
+          << Base::Unit::Frequency << Base::Unit::Force << Base::Unit::HeatFlux << Base::Unit::Length
+          << Base::Unit::LuminousIntensity << Base::Unit::Mass << Base::Unit::MagneticFluxDensity
+          << Base::Unit::Pressure << Base::Unit::Power << Base::Unit::SpecificHeat
+          << Base::Unit::Stress << Base::Unit::Temperature << Base::Unit::ThermalConductivity
+          << Base::Unit::ThermalExpansionCoefficient << Base::Unit::ThermalTransferCoefficient
+          << Base::Unit::TimeSpan << Base::Unit::Velocity << Base::Unit::Volume << Base::Unit::Work;
     for (QList<Base::Unit>::iterator it = units.begin(); it != units.end(); ++it) {
         ui->unitsBox->addItem(it->getTypeString());
     }