diff --git a/print_pdf/print_pdf.admin.inc b/print_pdf/print_pdf.admin.inc
index d7b2f970996d5f7fa1065f5f384b08cca4904b57..1df12220c330d7050f7e062d45cff782275df441 100644
--- a/print_pdf/print_pdf.admin.inc
+++ b/print_pdf/print_pdf.admin.inc
@@ -33,13 +33,6 @@ function print_pdf_settings() {
       '#description' => t('This option selects the PDF generation tool being used by this module to create the PDF version.'),
     );
 
-    $form['settings']['print_pdf_tcpdf_subsetting'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Enable TCPDF font subsetting'),
-      '#default_value' => variable_get('print_pdf_tcpdf_subsetting', PRINT_PDF_TCPDF_SUBSETTING_DEFAULT),
-      '#description' => t('Only embed those font characters that are actually used.  This can generates smaller PDF files but may significantly slow down processing.  This option has no effect unless TCPDF is selected above.'),
-    );
-
     $form['settings']['print_pdf_link_pos'] = array(
       '#type' => 'checkboxes',
       '#title' => t('PDF version link'),
@@ -214,6 +207,12 @@ function print_pdf_settings() {
       '#maxlength' => 3,
       '#description' => t('(TCPDF only) Set the font size to be used for normal text. This is the base value for the scaling applied to other text styles.'),
     );
+    $form['settings']['print_pdf_font_subsetting'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Enable font subsetting'),
+      '#default_value' => variable_get('print_pdf_font_subsetting', PRINT_PDF_FONT_SUBSETTING_DEFAULT),
+      '#description' => t('(TCPDF only) Only embed those font characters that are actually used.  This can generates smaller PDF files but may significantly slow down processing.'),
+    );
     $form['settings']['print_pdf_dompdf_unicode'] = array(
       '#type' => 'checkbox',
       '#title' => t("Use dompdf's Unicode Mode"),
diff --git a/print_pdf/print_pdf.module b/print_pdf/print_pdf.module
index dbf7d2579e23f679749d63d7e7d1555064ff9578..8d64f5a211b6d983dbcecfc120346d18edbf91f0 100644
--- a/print_pdf/print_pdf.module
+++ b/print_pdf/print_pdf.module
@@ -30,10 +30,10 @@ define('PRINT_PDF_PAGE_ORIENTATION_DEFAULT', 'portrait');
 define('PRINT_PDF_AUTOCONFIG_DEFAULT', 1);
 define('PRINT_PDF_FONT_FAMILY_DEFAULT', 'dejavusans');
 define('PRINT_PDF_FONT_SIZE_DEFAULT', 10);
+define('PRINT_PDF_FONT_SUBSETTING_DEFAULT', 0);
 define('PRINT_PDF_FILENAME_DEFAULT', '[site-name] - [title] - [mod-yyyy]-[mod-mm]-[mod-dd]');
 define('PRINT_PDF_DOMPDF_UNICODE_DEFAULT', 0);
 define('PRINT_PDF_WKHTMLTOPDF_OPTIONS', "--footer-font-size 7 --footer-right '[page]'");
-define('PRINT_PDF_TCPDF_SUBSETTING_DEFAULT', 0);
 
 /**
  * Implementation of hook_perm().