diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index dcc544db6..cde96469e 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -1,6 +1,7 @@
 package Slic3r::Config;
 use strict;
 use warnings;
+use utf8;
 
 use constant PI => 4 * atan2(1, 1);
 
@@ -32,9 +33,13 @@ our $Options = {
         type    => 'f',
     },
     'filament_packing_density' => {
-        label   => 'Packing density (mm)',
+        label   => 'Packing density',
         type    => 'f',
     },
+    'temperature' => {
+        label   => 'Temperature (°C)',
+        type    => 'i',
+    },
     
     # speed options
     'print_feed_rate' => {
@@ -81,10 +86,6 @@ our $Options = {
         label   => 'Fill angle (°)',
         type    => 'i',
     },
-    'temperature' => {
-        label   => 'Temperature (°C)',
-        type    => 'i',
-    },
     
     # retraction options
     'retract_length' => {
diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index 8adcc52e7..8b68ae32d 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -21,7 +21,7 @@ sub new {
         ),
         filament => Slic3r::GUI::OptionsGroup->new($self,
             title => 'Filament',
-            options => [qw(filament_diameter filament_packing_density)],
+            options => [qw(filament_diameter filament_packing_density temperature)],
         ),
         speed => Slic3r::GUI::OptionsGroup->new($self,
             title => 'Speed',
@@ -33,7 +33,7 @@ sub new {
         ),
         print => Slic3r::GUI::OptionsGroup->new($self,
             title => 'Print settings',
-            options => [qw(perimeter_offsets solid_layers fill_density fill_angle temperature)],
+            options => [qw(perimeter_offsets solid_layers fill_density fill_angle)],
         ),
         retract => Slic3r::GUI::OptionsGroup->new($self,
             title => 'Retraction',
diff --git a/slic3r.pl b/slic3r.pl
index a65605e9e..8401a5856 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -31,6 +31,7 @@ GetOptions(
     # filament options
     'filament-diameter=f'           => \$Slic3r::filament_diameter,
     'filament-packing-density=f'    => \$Slic3r::filament_packing_density,
+    'temperature=i'         => \$Slic3r::temperature,
     
     # speed options
     'print-feed-rate=i'             => \$Slic3r::print_feed_rate,
@@ -48,7 +49,6 @@ GetOptions(
     'fill-type=s'           => \$Slic3r::fill_type,
     'fill-density=f'        => \$Slic3r::fill_density,
     'fill-angle=i'          => \$Slic3r::fill_angle,
-    'temperature=i'         => \$Slic3r::temperature,
     
     # retraction options
     'retract-length=f'          => \$Slic3r::retract_length,
@@ -128,6 +128,7 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
     --filament-packing-density
                         Ratio of the extruded volume over volume pushed 
                         into the extruder (default: $Slic3r::filament_packing_density)
+    --temperature       Extrusion temperature (default: $Slic3r::temperature)
     
   Speed options:
     --print-feed-rate   Speed of print moves in mm/sec (default: $Slic3r::print_feed_rate)
@@ -151,7 +152,6 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
                         (range: 1+, default: $Slic3r::solid_layers)
     --fill-density      Infill density (range: 0-1, default: $Slic3r::fill_density)
     --fill-angle        Infill angle in degrees (range: 0-90, default: $Slic3r::fill_angle)
-    --temperature       Extrusion temperature (default: $Slic3r::temperature)
   
   Retraction options:
     --retract-length    Length of retraction in mm when pausing extrusion