diff --git a/block_simple_clock.php b/block_simple_clock.php
index bc055e4d058ca14ea48102340de1fdb615570f39..4a2e701ec2d788fd658241266c04596b4457be13 100644
--- a/block_simple_clock.php
+++ b/block_simple_clock.php
@@ -128,7 +128,11 @@ class block_simple_clock extends block_base {
         if ($showserverclock) {
             $this->content->text .= '<tr>';
             if ($showicons) {
-                $iconimage = $OUTPUT->pix_icon('favicon', 'Server icon', 'theme');
+                if (get_config('simple_clock', 'display_generic_servericon')) {
+                    $iconimage = $OUTPUT->pix_icon('server', 'Server icon', 'block_simple_clock');
+                } else {
+                    $iconimage = $OUTPUT->pix_icon('favicon', 'Server icon', 'theme');
+                }
                 $this->content->text .= '<td>'.$iconimage.'</td>';
             }
             $this->content->text .= '<td>'.get_string('server', 'block_simple_clock').':</td>';
diff --git a/lang/en/block_simple_clock.php b/lang/en/block_simple_clock.php
index 82fc1cbe7cc73dbac60aca834bced86e59c0506e..ef5fbf1835a14537fff631c1d3178519539e11bb 100644
--- a/lang/en/block_simple_clock.php
+++ b/lang/en/block_simple_clock.php
@@ -30,6 +30,10 @@ $string['after_noon'] = 'pm';
 $string['before_noon'] = 'am';
 $string['clock_separator'] = ':';
 
+// Global config strings
+$string['sitewide_setting_servericon'] = 'Use generic server icon';
+$string['sitewide_setting_servericon_desc'] = 'Display a generic server icon {$a->servericon} instead of the site\'s favicon {$a->favicon} that <a href="{$a->faviconInfoURL}" target="_blank" title="Find out more">may not display in all browsers</a>.';
+
 // Config strings and help
 $string['clock_title_default'] = 'Clock';
 $string['config_clock_visibility'] = 'Visible clocks';
diff --git a/pix/server.png b/pix/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb8a316d29e4c8a597cd7179854ebebb27ee749b
Binary files /dev/null and b/pix/server.png differ
diff --git a/settings.php b/settings.php
new file mode 100644
index 0000000000000000000000000000000000000000..506856c298a9457dba08e545f55a03797ba44948
--- /dev/null
+++ b/settings.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     contrib
+ * @subpackage  block_simple_clock
+ * @author      Jennifer Edmondson
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die;
+
+if ($ADMIN->fulltree) {
+    global $OUTPUT;
+
+    $a->servericon = $OUTPUT->pix_icon('server', 'Server icon', 'block_simple_clock');
+    $a->favicon = $OUTPUT->pix_icon('favicon', 'Site favicon', 'theme');
+    $a->faviconInfoURL = 'http://en.wikipedia.org/wiki/Favicon#Standardisation';
+    $settings->add(new admin_setting_configcheckbox(
+                'simple_clock/display_generic_servericon',
+                get_string('sitewide_setting_servericon', 'block_simple_clock'),
+                get_string('sitewide_setting_servericon_desc', 'block_simple_clock', $a),
+                '0'
+            ));
+}
\ No newline at end of file