X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=573f2ba4f6af2a4d5b61d50c65883c452afa1898;hp=0c07e5af9841abfa323243e859015c391dcbf34c;hb=2999753577cd5fb23d7a88e2978c60d8bade44a6;hpb=ccf3c5cb4e102dacc69e779d8da5765de96af332

diff --git a/include/options/display.php b/include/options/display.php
index 0c07e5af..573f2ba4 100644
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -216,6 +216,28 @@ function load_optpage_data_display() {
                            SMPREF_TIME_24HR => _("24-hour clock"))
     );
 
+    /* Icon theme selection */
+    if ($use_icons) {
+        global $icon_themes, $icon_theme;
+        $temp = array();
+        for ($count = 0; $count < sizeof($icon_themes); $count++) {
+            $temp[$count] = $icon_themes[$count]['NAME'];
+            if ($icon_theme == $icon_themes[$count]['PATH'])
+                $value = $count;
+        }
+        if (sizeof($icon_themes) > 0) {
+            $optvals[SMOPT_GRP_GENERAL][] = array(
+                'name'          => 'icon_theme',
+                'caption'       => _("Icon Theme"),
+                'type'          => SMOPT_TYPE_STRLIST,
+                'refresh'       => SMOPT_REFRESH_NONE,
+                'posvals'       => $temp,
+                'initial_value' => $value,
+                'save'          => 'icon_theme_save'
+            );
+        }
+    }
+
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_MAILBOX] = _("Mailbox Display Options");
     $optvals[SMOPT_GRP_MAILBOX] = array();
@@ -242,27 +264,6 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    if ($use_icons) {
-        global $icon_themes, $icon_theme;
-        $temp = array();
-        for ($count = 0; $count < sizeof($icon_themes); $count++) {
-            $temp[$count] = $icon_themes[$count]['NAME'];
-            if ($icon_theme == $icon_themes[$count]['PATH'])
-                $value = $count;
-        }
-        if (sizeof($icon_themes) > 0) {
-            $optvals[SMOPT_GRP_MAILBOX][] = array(
-                'name'          => 'icon_theme',
-                'caption'       => _("Message Flags Icon Theme"),
-                'type'          => SMOPT_TYPE_STRLIST,
-                'refresh'       => SMOPT_REFRESH_NONE,
-                'posvals'       => $temp,
-                'initial_value' => $value,
-                'save'          => 'icon_theme_save'
-            );
-        }
-    }
-
     $optvals[SMOPT_GRP_MAILBOX][] = array(
         'name'    => 'show_flag_buttons',
         'caption' => _("Show Flag / Unflag Buttons"),