Merge branch 'michal-wip'

82 files changed, 2052 insertions, 15814 deletions

diff --git a/mate-volume-control/AUTHORS b/mate-volume-control/AUTHORS
deleted file mode 100644
index 3f6dd9e..0000000
--- a/mate-volume-control/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-William Jon McCann <[email protected]>
-Bastien Nocera <[email protected]>
diff --git a/mate-volume-control/ChangeLog.pre-2-26 b/mate-volume-control/ChangeLog.pre-2-26
deleted file mode 100644
index 8b38808..0000000
--- a/mate-volume-control/ChangeLog.pre-2-26
+++ /dev/null
@@ -1,1245 +0,0 @@
-2009-03-16  Marc-André Lureau  <[email protected]>
-
-	* src/Makefile.am (*_SOURCES): Fix make dist. Include gvc-log.h.
-
-2009-03-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (on_stream_decibel_notify),
-	(gvc_stream_status_icon_set_mixer_stream): Also update the
-	tooltip when decibels change, fixes the dB value pretty much
-	always being wrong (the code notifies of the changed dB after the
-	changed volume) (Closes: #575093)
-
-2009-03-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(gvc_balance_bar_set_balance_type), (gvc_balance_bar_set_property),
-	(gvc_balance_bar_class_init), (on_adjustment_value_changed),
-	(gvc_balance_bar_init), (gvc_balance_bar_new): Fix use of the
-	zero_adjustment GtkAdjustment in slider callbacks, export
-	gvc_channel_bar_scroll
-	* src/gvc-balance-bar.h: Export gvc_channel_bar_scroll
-
-	* src/gvc-stream-status-icon.c (on_status_icon_scroll_event):
-	Use gvc_channel_bar_scroll instead of our own code
-
-	(Closes: #564313)
-
-2009-03-06  Matthias Clasen  <[email protected]>
-
-	* src/applet-main.c:
-	* src/dialog-main.c: Wire up --debug
-
-	* src/gvc-log.[hc]: Add some trivial logging infrastructure
-
-	* src/Makefile.am: Add gvc-log.c
-
-2009-03-04  Bastien Nocera  <[email protected]>
-
-	* src/Makefile.am: Link to libsoundtheme.la, not using
-	-l against a static lib
-
-==================== 2.25.92 ====================
-
-2009-02-23  Matthias Clasen  <[email protected]>
-
-	Bug 572665 – update sensitivity of input feedback checkbox
-
-	* src/gvc-sound-theme-chooser.c (update_theme): Make the window
-	and button sounds button insensitive too.
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_scale_scroll_event): Make the balance bar instant-apply
-	(Closes: #566423)
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock): Fix warning
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock),
-	(gvc_stream_status_icon_constructor): Patch from Yanko Kaneti
-	<[email protected]> to fix the dock showing up off-screen
-	when the applet is at the bottom of the screen and is popped
-	up for the first time (Closes: #564312)
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_source): Don't filter out
-	non-hardware sources, only ignore sink monitors
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink): Don't filter out
-	sinks with PA_SINK_HARDWARE, otherwise things like network sinks
-	(Airport Express?) won't show up in the volume capplet
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (on_scale_scroll_event),
-	(gvc_channel_bar_set_is_amplified), (gvc_channel_bar_set_property),
-	(gvc_channel_bar_get_property), (gvc_channel_bar_class_init),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h: Add "is-amplified" property. In this mode,
-	the volume can be set above 100% (150% tops actually) for inputs
-	that support giving us the dB information
-	* src/gvc-mixer-dialog.c (on_mixer_control_default_source_changed),
-	(add_stream): Disconnect the value-changed signal, and
-	reconnect it when we're done setting is_amplified for source streams
-	that support giving dB info
-	(Closes: #567536)
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-map.c (gvc_channel_map_can_balance),
-	(set_from_pa_map):
-	* src/gvc-channel-map.h: Add API to detect whether a channel
-	map supports balancing
-	* src/gvc-mixer-dialog.c (update_output_settings): De-sensitivise
-	the balance bar if the output doesn't support balacing
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (on_adjustment_value_changed):
-	Remove fixed FIXME
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/applet-main.c: Remove unused macro
-
-2009-02-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_stream_collate): Fix run-time
-	warning when there's no name for a stream, such as some events
-	from libcanberra
-
-2009-02-12  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_control_ready), (warning_dialog_answered),
-	(dialog_popup_timeout), (main): When PulseAudio isn't running,
-	or takes a long time to connect to, popup a dialogue telling
-	the user what we're waiting for, and the ability to cancel
-	(Closes: #566835)
-
-2009-02-11  Bastien Nocera  <[email protected]>
-
-	* src/applet-main.c (main): Use libunique instead of D-Bus
-	and refuse to run if an applet is already running
-	* src/dialog-main.c (message_received_cb), (on_control_ready),
-	(main): present the application when it's already running
-	(Closes: #542727)
-
-2009-02-11  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (on_scale_button_release_event):
-	* src/gvc-sound-theme-chooser.c (play_preview_for_path):
-	* src/gvc-sound-theme-editor.c (play_sound_preview),
-	(play_sound_at_path): Don't call ca_gtk_context_get () when
-	we're not going to use the returned context, set the
-	application id for all the calls to ca_gtk_play_*()
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Correct the label to mention that there are no recording apps as well
-	(Closes: #568900)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* data/Makefile.am: Install the applet's desktop file in the
-	xdg autostart directory (Closes: #570114)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_source_output):
-	* src/gvc-mixer-dialog.c (add_stream): Show recording applications
-	in addition to playback applications, use the microphone icon
-	for those applications (Closes: #568900)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	* src/gvc-mixer-control.c (set_application_id_from_proplist),
-	(update_sink_input), (update_source_output):
-	* src/gvc-mixer-dialog.c (create_monitor_stream_for_source):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_application_id),
-	(gvc_mixer_stream_set_application_id),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h: Set the org.mate.VolumeControl application
-	ID for the input peak monitor, and ignore it when checking whether
-	an application is using the input. Also ignore Pavucontrol.
-	Stops the microphone showing up in the applet when the capplet is
-	running (Closes: #565146)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons): Revert accidentally
-	committing the rejected patch for bug #565146
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (gvc_balance_bar_init): Make sure the balance
-	bar stays Left to Right, so that the Left balance is really on the
-	left
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new), (gvc_balance_bar_init):
-	Patch from Luca Ferretti <[email protected]>, to use the new GTK+
-	scale marks for the balance widget (Closes: #565144)
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_dialog_response), (on_dialog_close):
-	Use gtk_main_quit () instead of exit (), so that all the
-	objects are unref'ed cleanly
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_dialog_response), (on_dialog_close),
-	(on_control_ready): Exit when Esc is pressed
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_finalize):
-	Remove any lingering timeouts when finalizing the object
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/Makefile.am: Fix automake warning
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-stream-status-icon.c (on_status_icon_scroll_event),
-	(update_icon), (gvc_stream_status_icon_init): Remove ifdef's
-	from the volume control code, as GTK+ 2.15.1 is now required
-	(Closes: #564318)
-
-2009-01-24  Luca Ferretti  <[email protected]>
-
-	* data/mate-volume-control.desktop.in.in:
-	Icon name is mate-volume-control, not mate-sound-properties.
-
-2009-01-23  Bastien Nocera  <[email protected]>
-
-	* data/icons/16x16/apps/Makefile.am:
-	* data/icons/22x22/apps/Makefile.am:
-	* data/icons/24x24/apps/Makefile.am:
-	* data/icons/32x32/apps/Makefile.am:
-	* data/icons/48x48/apps/Makefile.am:
-	* data/icons/scalable/apps/Makefile.am:
-	Install the application icon in the global
-	icon theme, not in our private directory
-	(Closes: #568635)
-
-	* data/icons/Makefile.am: Don't run gtk-update-icon-cache
-	for a private icons directory
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* data/Makefile.am:
-	* data/icons/48x48/apps/Makefile.am:
-	* data/icons/Makefile.am:
-	* src/Makefile.am: Fix distcheck
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_scale_scroll_event), (gvc_channel_bar_init): Move the
-	setup of the press and release button events to _scale_box_new(),
-	otherwise it's not handled with horizontal scales.
-	When scrolling with the mouse wheel, swap the up/down directions
-	to work as expected (Closes: #567034)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (set_is_event_stream_from_proplist),
-	(update_sink_input):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_is_event_stream),
-	(gvc_mixer_stream_set_is_event_stream),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h: Add the "is-event-stream" property,
-	to check whether the role of a stream is to play an event
-
-	* src/gvc-mixer-dialog.c (add_stream): Don't show event streams
-	in the applications tab (Closes: #565145)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Add Close button, and change the spacing around it to
-	match existing capplets (Closes: #564314)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* data/mate-volume-control-applet.desktop.in: Start
-	mate-volume-control after the panel, not at the same time,
-	spotted by Chris Coulson (Closes: #568320)
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Don't show no apps message if there are apps.
-	Fixes #567250
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c
-	(gvc_stream_status_icon_constructor):
-	Reduce border around volume slider dock
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_zero_adjustment_value_changed), (gvc_channel_bar_init):
-	Make volume sliders instantaneous.
-
-	Patch from: Bastien Nocera  <[email protected]>
-	Fixes #564313
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (on_menu_mute_toggled),
-	(on_status_icon_popup_menu):
-	Add a mute toggle item to the context menu.
-
-	Patch from: Paolo Borelli <[email protected]>
-	Fixes #567510
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	Don't leak a list of sources.
-
-	Patch from: Paolo Borelli <[email protected]>
-	Fixes #567514
-
-2009-01-10  William Jon McCann  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new):
-	Don't paint the scale trough.
-	Patch from: Matthias Clasen  <[email protected]>
-	Fixes part of #565144
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock):
-	addresses a bunch of positioning problems
-	Patch from: Matthias Clasen  <[email protected]>
-	Fixes #564312
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (on_treeview_selection_changed):
-	Check for null selection.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* data/sounds/Makefile.am:
-	* data/sounds/mate-sounds-default.xml.in.in:
-	Add drip, glass, and sonar sounds.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/sounds/Makefile.am:
-	* data/sounds/mate-sounds-default.xml.in.in:
-	* src/Makefile.am:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (set_combox_for_theme_name),
-	(xml_get_and_trim_names), (populate_model_from_node),
-	(populate_model_from_file), (populate_model_from_dir),
-	(save_alert_sounds), (update_alert_model), (update_alert),
-	(on_alert_toggled), (play_preview_for_path),
-	(create_alert_treeview), (get_file_type),
-	(update_alerts_from_theme_name), (update_theme),
-	(gvc_sound_theme_chooser_init):
-	* src/sound-theme-file-utils.c (custom_theme_dir_is_empty),
-	(delete_old_files), (delete_disabled_files), (add_disabled_file),
-	(add_custom_file), (create_custom_theme):
-	* src/sound-theme-file-utils.h:
-	Add sound set.  Properly set the active alert sound in the
-	model.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (on_combobox_changed),
-	(set_input_feedback_enabled), (update_theme), (on_alert_toggled),
-	(play_preview_for_path), (on_treeview_row_activated),
-	(on_treeview_selection_changed), (create_alert_treeview),
-	(gvc_sound_theme_chooser_constructor),
-	(gvc_sound_theme_chooser_init):
-	* src/gvc-sound-theme-editor.c (theme_changed_custom_reinit),
-	(on_theme_changed), (load_index_theme_name), (sound_theme_in_dir),
-	(add_theme_to_store), (set_theme_name), (audible_bell_foreach),
-	(set_audible_bell_enabled), (input_feedback_foreach),
-	(set_input_feedback_enabled), (get_file_type),
-	(theme_changed_custom_init), (update_theme),
-	(setup_theme_selector), (play_sound_preview), (get_sound_filename),
-	(count_customised_sounds), (save_sounds), (save_custom_theme),
-	(dump_theme), (on_setting_column_edited), (fill_custom_model),
-	(on_combobox_editing_started), (play_sound_at_path),
-	(setting_set_func), (activatable_cell_renderer_pixbuf_activate),
-	(activatable_cell_renderer_pixbuf_init),
-	(activatable_cell_renderer_pixbuf_class_init),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_editor_constructor),
-	(gvc_sound_theme_editor_class_init), (on_click_feedback_toggled),
-	(on_key_changed), (on_treeview_row_activated),
-	(constrain_list_size), (setup_list_size_constraint),
-	(gvc_sound_theme_editor_init), (gvc_sound_theme_editor_finalize),
-	(gvc_sound_theme_editor_new):
-	* src/gvc-sound-theme-editor.h:
-	Simplify the theme selection.  Move the ability to
-	customize the sound theme into a separate widget.  We
-	should add a Customize button to access it.
-	This new approach will mirror the way we handle
-	wallpapers.  Next thing to do is to add a set
-	of standard alert sounds that one can choose from.
-	And have the widget customize the selected theme to
-	use them.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Move the sound effects tab back to the first one.
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Move the sound effects tab to be the last one
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (setup_theme_custom_selector):
-	Change the ellipsising to be at the start
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* data/mate-volume-control.desktop.in.in:
-	Add a .desktop file to launch g-v-c from the
-	control-center (and preferences menu)
-
-	* data/Makefile.am: changes for the above
-
-	* data/icons/16x16/Makefile.am:
-	* data/icons/16x16/apps/*:
-	* data/icons/22x22/Makefile.am:
-	* data/icons/22x22/apps/*:
-	* data/icons/24x24/Makefile.am:
-	* data/icons/24x24/apps/*:
-	* data/icons/32x32/Makefile.am:
-	* data/icons/32x32/apps/*:
-	* data/icons/48x48/*:
-	* data/icons/scalable/Makefile.am:
-	* data/icons/scalable/apps/*:
-	Add icons for the .desktop file
-
-2008-12-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (setup_theme_custom_selector):
-	Set the first column's text to be ellipsised, and expanded,
-	fixes the window resizing on startup, but still some unsightly
-	resizing in the treeview itself
-
-2008-12-17  Bastien Nocera  <[email protected]>
-
-	* AUTHORS: Add myself, having written much of src/*theme*.[ch]
-
-2008-12-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_size_allocate):
-	Recalculate layout for allocation.
-
-2008-12-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (layout_changed), (reset_max_peak),
-	(bar_calc_layout), (update_peak_value), (update_rms_value),
-	(gvc_level_bar_expose):
-	Separate the layout calculation from the draw.
-	Only queue a redraw if the layout actually changes.
-	Reduces cpu usage considerably.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_expose):
-	Compress expose event queue.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new):
-	Add left and right labels.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_expose):
-	Round corners a bit more.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (reset_max_peak), (update_peak_value),
-	(gvc_level_bar_expose):
-	Add peak of level indicator.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-level-bar.c (fraction_from_adjustment),
-	(update_peak_value), (update_rms_value),
-	(gvc_level_bar_get_orientation), (gvc_level_bar_set_orientation),
-	(on_peak_adjustment_value_changed),
-	(on_rms_adjustment_value_changed),
-	(gvc_level_bar_set_peak_adjustment),
-	(gvc_level_bar_set_rms_adjustment),
-	(gvc_level_bar_get_peak_adjustment),
-	(gvc_level_bar_get_rms_adjustment), (gvc_level_bar_set_scale),
-	(gvc_level_bar_set_property), (gvc_level_bar_get_property),
-	(gvc_level_bar_constructor), (gvc_level_bar_size_request),
-	(gvc_level_bar_size_allocate), (curved_rectangle),
-	(gvc_level_bar_expose), (gvc_level_bar_class_init),
-	(gvc_level_bar_init), (gvc_level_bar_finalize),
-	(gvc_level_bar_new):
-	* src/gvc-level-bar.h:
-	* src/gvc-mixer-dialog.c (update_input_peak),
-	(gvc_mixer_dialog_constructor):
-	* src/rb-segmented-bar.c:
-	* src/rb-segmented-bar.h:
-	Remove rb-segmented-bar and add a new GvcLevelBar.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(gvc_balance_bar_set_size_group),
-	(gvc_balance_bar_set_channel_map), (gvc_balance_bar_set_property),
-	(gvc_balance_bar_get_property), (gvc_balance_bar_constructor),
-	(gvc_balance_bar_class_init), (on_left), (on_right),
-	(on_adjustment_value_changed), (gvc_balance_bar_init),
-	(gvc_balance_bar_finalize), (gvc_balance_bar_new):
-	* src/gvc-balance-bar.h:
-	* src/gvc-channel-map.c (gvc_channel_map_class_init),
-	(gvc_channel_map_gains_changed), (set_from_pa_map):
-	* src/gvc-channel-map.h:
-	* src/gvc-mixer-control.c (gvc_mixer_control_set_default_sink),
-	(gvc_mixer_control_set_default_source),
-	(update_default_source_from_name), (update_default_sink_from_name),
-	(update_sink), (update_source), (update_sink_input),
-	(update_event_role_stream):
-	* src/gvc-mixer-dialog.c (update_output_settings),
-	(on_mixer_control_default_sink_changed), (add_stream),
-	(on_output_radio_toggled), (gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume):
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume):
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume):
-	* src/gvc-mixer-stream.c (on_channel_map_gains_changed),
-	(gvc_mixer_stream_set_channel_map):
-	Add output balance control.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* AUTHORS: updated email address
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-channel-map.c (gvc_channel_map_get_num_channels),
-	(gvc_channel_map_get_gains), (gvc_channel_map_get_positions),
-	(gvc_channel_map_class_init), (gvc_channel_map_init),
-	(gvc_channel_map_finalize), (gvc_channel_map_new),
-	(set_from_pa_map), (gvc_channel_map_new_from_pa_channel_map):
-	* src/gvc-channel-map.h:
-	* src/gvc-mixer-control.c (update_sink), (update_source),
-	(update_sink_input), (update_source_output):
-	* src/gvc-mixer-event-role.c (update_settings),
-	(gvc_mixer_event_role_new):
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume),
-	(gvc_mixer_sink_input_new):
-	* src/gvc-mixer-sink-input.h:
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume),
-	(gvc_mixer_sink_new):
-	* src/gvc-mixer-sink.h:
-	* src/gvc-mixer-source-output.c (gvc_mixer_source_output_new):
-	* src/gvc-mixer-source-output.h:
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume),
-	(gvc_mixer_source_new):
-	* src/gvc-mixer-source.h:
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_channel_map),
-	(gvc_mixer_stream_set_channel_map),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	Add a ChannelMap class that we can use to manipulate channel
-	volume levels.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new), (update_layout),
-	(gvc_channel_bar_set_size_group),
-	(gvc_channel_bar_set_orientation), (gvc_channel_bar_constructor),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream),
-	(gvc_mixer_dialog_constructor):
-	Don't put the end box in the size group for app channel bars.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream), (remove_stream),
-	(gvc_mixer_dialog_constructor):
-	Show explanation when no apps are playing.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-channel-bar.c (_scale_box_new):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_pa_context),
-	(update_default_source_from_name):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (update_input_peak), (update_input_meter),
-	(on_monitor_suspended_callback), (on_monitor_read_callback),
-	(create_monitor_stream_for_source),
-	(on_mixer_control_default_source_changed), (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/rb-segmented-bar.c (rb_segment_new), (rb_segment_free),
-	(rb_segmented_bar_init), (rb_segmented_bar_class_init),
-	(rb_segmented_bar_finalize), (rb_segmented_bar_get_property),
-	(rb_segmented_bar_set_property),
-	(rb_segmented_bar_default_value_formatter),
-	(rb_segmented_bar_size_request), (create_adapt_layout),
-	(compute_layout_size), (rb_segmented_bar_size_allocate),
-	(rb_segmented_bar_add_segment),
-	(rb_segmented_bar_add_segment_default_color),
-	(rb_segmented_bar_update_segment), (draw_rounded_rectangle),
-	(rb_segmented_bar_render_segments), (modula), (hsb_from_color),
-	(color_from_hsb), (color_shade), (make_segment_gradient),
-	(rb_segmented_bar_render_strokes), (rb_segmented_bar_render),
-	(rb_segmented_bar_render_labels), (rb_segmented_bar_expose),
-	(rb_segmented_bar_new), (rb_segmented_bar_set_value_formatter):
-	* src/rb-segmented-bar.h:
-	Add input level monitor.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_orientation):
-	Use the same size group for the start and end of
-	the channel bar.
-
-2008-12-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (get_sound_filename):
-	Set a parent for the file chooser
-
-2008-12-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (update_icon): Fix
-	last commit, we need to use commas, not dots to separate
-	major, minor and micro versions
-
-2007-12-12  Matthias Clasen  <[email protected]>
-
-        Bug 564176 – dependency on API from gtk+ trunk
-
-        * mate-volume-control/src/gvc-stream-status-icon.c: Don't use
-        GTK+ 2.16 API unconditionally. Reported by Frederic Peters
-
-2008-12-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_source):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_decibel),
-	(gvc_mixer_stream_set_decibel), (gvc_mixer_stream_get_can_decibel),
-	(gvc_mixer_stream_set_can_decibel),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	* src/gvc-stream-status-icon.c (update_icon):
-	Add decibel level support.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (maybe_show_status_icons), (gvc_applet_start),
-	(on_control_stream_removed), (on_control_stream_added),
-	(gvc_applet_constructor):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_source_outputs),
-	(update_source), (update_sink_input), (update_source_output),
-	(update_event_role_stream):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-source-output.c
-	(gvc_mixer_source_output_change_volume),
-	(gvc_mixer_source_output_change_is_muted),
-	(gvc_mixer_source_output_constructor),
-	(gvc_mixer_source_output_class_init),
-	(gvc_mixer_source_output_init), (gvc_mixer_source_output_finalize),
-	(gvc_mixer_source_output_new):
-	* src/gvc-mixer-source-output.h:
-	* src/gvc-stream-status-icon.c (update_icon),
-	(on_status_icon_visible_notify), (gvc_stream_status_icon_init):
-	Show/hide input level status icon based on presence of
-	a "source output" stream.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (gvc_channel_bar_set_low_icon_name),
-	(gvc_channel_bar_set_high_icon_name),
-	(gvc_channel_bar_set_property), (gvc_channel_bar_get_property),
-	(gvc_channel_bar_class_init), (gvc_channel_bar_init),
-	(gvc_channel_bar_finalize):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_set_page):
-	Use the new input icons in the dialog.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/applet-main.c (main):
-	* src/dialog-main.c (main):
-	Append the icon search path to the icon theme.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c:
-	Use new icons.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/icons/*:
-	Add some input level icons from Mike Langlie.  Just
-	an initial draft.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (gvc_applet_start), (gvc_applet_dispose),
-	(update_default_source), (update_default_sink), (on_control_ready),
-	(on_control_default_sink_changed),
-	(on_control_default_source_changed), (gvc_applet_constructor),
-	(gvc_applet_class_init), (gvc_applet_init), (gvc_applet_finalize):
-	* src/gvc-stream-status-icon.c (on_adjustment_value_changed),
-	(popup_dock), (on_status_icon_activate),
-	(on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu), (on_status_icon_scroll_event),
-	(gvc_icon_release_grab), (on_dock_button_press), (popdown_dock),
-	(gvc_icon_grab_notify), (on_dock_grab_notify),
-	(on_dock_grab_broken_event), (on_dock_key_release),
-	(maybe_show_status_icon), (update_icon),
-	(gvc_stream_status_icon_set_icon_names), (on_stream_volume_notify),
-	(on_stream_is_muted_notify),
-	(gvc_stream_status_icon_set_display_name),
-	(gvc_stream_status_icon_set_mixer_stream),
-	(gvc_stream_status_icon_set_property),
-	(gvc_stream_status_icon_get_property), (on_bar_is_muted_notify),
-	(gvc_stream_status_icon_constructor),
-	(gvc_stream_status_icon_dispose),
-	(gvc_stream_status_icon_class_init), (gvc_stream_status_icon_init),
-	(gvc_stream_status_icon_finalize), (gvc_stream_status_icon_new):
-	* src/gvc-stream-status-icon.h:
-	Create a stream-status-icon class.  Create a status icon
-	for input stream.  Todo: only show input status icon
-	when an application is recording, use microphone images.
-
-2008-12-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (gvc_channel_bar_init):
-	Make label left aligned.
-
-2008-12-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_sink_input),
-	(update_client), (remove_client), (gvc_mixer_control_init):
-	Use application/client name instead of stream name.
-
-2008-12-05  Marc-André Lureau  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_set_page):
-	Added --page argument for compatibility reasons (used by g-s-r,
-	for instance). Closes: #563289
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink_input),
-	(update_event_role_stream):
-	Add debug for event stuff.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_stream_volume_notify),
-	(on_stream_is_muted_notify):
-	Fix crash when can't find a bar for stream.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (update_default_input),
-	(update_default_output), (on_mixer_control_default_sink_changed),
-	(on_mixer_control_default_source_changed), (add_stream),
-	(on_input_radio_toggled), (on_output_radio_toggled),
-	(create_stream_treeview), (gvc_mixer_dialog_constructor):
-	Use radio buttons instead of selection to change default in/out.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new), (gvc_channel_bar_new):
-	* src/gvc-mixer-control.c (_set_default_source),
-	(_set_default_sink):
-	Make range update policy discontinuous.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (constrain_list_size),
-	(setup_list_size_constraint), (gvc_sound_theme_chooser_init):
-	Make the initial size of the scrolled window more reasonable.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (create_stream_treeview):
-	* src/gvc-sound-theme-chooser.c (play_sound_at_path),
-	(activatable_cell_renderer_pixbuf_activate),
-	(setup_theme_custom_selector), (on_treeview_row_activated),
-	(gvc_sound_theme_chooser_init):
-	Hide treeview headers.  Make double click on tree rows
-	play sound preview.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icon), (update_icon),
-	(update_default_sink), (on_control_ready),
-	(on_control_default_sink_changed), (gvc_applet_init):
-	* src/gvc-mixer-control.c (remove_stream):
-	Hide the status icon when there is no output device.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_mixer_control_set_default_sink),
-	(gvc_mixer_control_set_default_source), (_set_default_source),
-	(_set_default_sink), (_stream_has_name), (find_stream_for_name),
-	(update_default_source_from_name), (update_default_sink_from_name),
-	(update_server), (update_sink), (update_source),
-	(update_sink_input), (gvc_mixer_control_class_init):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (on_mixer_control_default_sink_changed),
-	(on_mixer_control_default_source_changed),
-	(gvc_mixer_dialog_set_mixer_control), (bar_set_stream),
-	(add_stream), (find_stream_by_id), (remove_stream),
-	(on_control_stream_removed), (create_stream_treeview),
-	(on_input_treeview_selection_changed),
-	(on_output_treeview_selection_changed),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_set_property),
-	(gvc_mixer_stream_get_property), (gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	Add support for changing the default sink and source.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-mixer-control.c (update_event_role_stream):
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream):
-	* src/gvc-mixer-event-role.c (update_settings),
-	(gvc_mixer_event_role_change_volume),
-	(gvc_mixer_event_role_change_is_muted),
-	(gvc_mixer_event_role_set_device),
-	(gvc_mixer_event_role_set_property),
-	(gvc_mixer_event_role_get_property),
-	(gvc_mixer_event_role_constructor),
-	(gvc_mixer_event_role_class_init), (gvc_mixer_event_role_init),
-	(gvc_mixer_event_role_finalize), (gvc_mixer_event_role_new):
-	* src/gvc-mixer-event-role.h:
-	Add event role stream.  Make setting event volume work.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_init):
-	* src/gvc-sound-theme-chooser.c (theme_changed_custom_reinit),
-	(on_combobox_changed), (audible_bell_foreach),
-	(set_audible_bell_enabled), (input_feedback_foreach),
-	(set_input_feedback_enabled), (get_file_type),
-	(theme_changed_custom_init), (update_theme),
-	(setup_theme_selector), (count_customised_sounds), (save_sounds),
-	(on_setting_column_edited), (fill_custom_model),
-	(on_combobox_editing_started), (setting_set_func),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_chooser_constructor), (on_click_feedback_toggled),
-	(on_key_changed), (gvc_sound_theme_chooser_init),
-	(gvc_sound_theme_chooser_new):
-	Simplify the theme chooser a bit.  Remove the visual bell stuff
-	since that should go into the to-be-written Universal Access
-	control panel.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_key_changed):
-	Don't assume all changed keys are booleans.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_init):
-	Use a separate size group for application streams.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Switch order of input and output tabs.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new):
-	Add labels to size group instead of scale because
-	using expand/fill widgets in a size group doesn't really
-	work.  And in practice the label is the only variable
-	length widget.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_dispose):
-	Only disconnect signals once.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (gvc_sound_theme_chooser_init):
-	Move alert and input sliders to the top.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (setup_theme_selector),
-	(gvc_sound_theme_chooser_init):
-	Drop the frame and label from the effects chooser.
-	Move the enable effects toggle up to the top.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	At mpt's suggestion, move the output slider to the top.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink_input),
-	(update_source_output), (update_event_role_stream),
-	(remove_client), (remove_sink), (remove_source),
-	(remove_sink_input), (remove_source_output):
-	* src/gvc-mixer-dialog.c (on_bar_is_muted_notify), (create_bar),
-	(bar_set_stream), (add_stream), (on_control_stream_added),
-	(on_control_stream_removed):
-	Set the associated stream on the bar so mute works.
-	Hush some debugging.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_source):
-	* src/gvc-mixer-dialog.c (add_stream):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_description),
-	(gvc_mixer_stream_set_description),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h:
-	Add descriptions and use them instead of names when
-	displaying sinks and sources.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream):
-	Don't show sinks/source in apps page.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream), (find_stream_by_id),
-	(on_control_stream_removed), (create_stream_treeview):
-	Try to remove streams from models.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream):
-	Also add default streams to tree models.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_streams):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (create_bar), (bar_set_stream),
-	(add_stream), (create_stream_treeview),
-	(gvc_mixer_dialog_constructor):
-	Add beginnings of output and input selection.
-
-2008-11-10  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	Don't crash if we don't get a default sink/source.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (remove_stream), (update_sink_input),
-	(update_event_role_stream):
-	* src/gvc-mixer-dialog.c (on_control_stream_added),
-	(on_control_stream_removed):
-	Fix adding and remove streams.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (_gtk_label_make_bold),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (gvc_sound_theme_chooser_init):
-	Tweak layout and add some placeholder treeviews.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_size_group):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (add_stream), (gvc_mixer_dialog_init):
-	Put all the scales in a size group.  Doesn't seem
-	to work though.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_enable_effects_toggled),
-	(on_click_feedback_toggled), (on_audible_bell_toggled),
-	(gvc_mixer_dialog_constructor), (on_key_changed),
-	(gvc_mixer_dialog_init):
-	Hook up the check buttons.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (setup_theme_selector),
-	(gvc_sound_theme_chooser_init):
-	Fix up some layout.  Hide the theme selector if there is
-	only one.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu):
-	* src/gvc-mixer-dialog.c (on_stream_is_muted_notify), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_new):
-	* src/gvc-sound-theme-chooser.c (theme_changed_custom_reinit),
-	(on_combobox_changed), (load_index_theme_name),
-	(sound_theme_in_dir), (add_theme_to_store),
-	(set_combox_for_theme_name), (on_theme_changed),
-	(setup_theme_selector), (visual_bell_mateconf_to_setting),
-	(visual_bell_setting_to_mateconf), (play_sound_preview),
-	(get_sound_filename), (count_customised_sounds), (save_sounds),
-	(save_custom_theme), (dump_theme), (on_setting_column_edited),
-	(fill_visual_bell_model), (fill_custom_model),
-	(on_combobox_editing_started), (play_sound_at_path),
-	(on_treeview_button_press_event), (setting_set_func),
-	(activatable_cell_renderer_pixbuf_activate),
-	(activatable_cell_renderer_pixbuf_init),
-	(activatable_cell_renderer_pixbuf_class_init),
-	(input_feedback_foreach), (set_input_feedback_enabled),
-	(on_input_feedback_changed), (audible_bell_foreach),
-	(set_audible_bell_enabled), (on_audible_bell_changed),
-	(get_file_type), (theme_changed_custom_init),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_chooser_constructor),
-	(gvc_sound_theme_chooser_class_init), (_gtk_label_make_bold),
-	(gvc_sound_theme_chooser_init), (gvc_sound_theme_chooser_finalize),
-	(gvc_sound_theme_chooser_new):
-	* src/gvc-sound-theme-chooser.h:
-	* src/sound-theme-file-utils.c (custom_theme_update_time),
-	(custom_theme_dir_path), (directory_delete_recursive),
-	(capplet_file_delete_recursive), (delete_custom_theme_dir),
-	(delete_one_file), (delete_old_files), (delete_disabled_files),
-	(create_one_file), (add_disabled_file), (add_custom_file):
-	* src/sound-theme-file-utils.h:
-	Redesign a bit in order to incorporate the sound properties.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (popup_dock), (on_bar_is_muted_notify),
-	(gvc_applet_init):
-	* src/gvc-channel-bar.c (on_zero_adjustment_value_changed),
-	(update_mute_button), (gvc_channel_bar_init):
-	Fix initial mute setting for applet.  When mute button
-	is not displayed use the "zero" position to indicate
-	muted state.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_init):
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_orientation), (update_mute_button),
-	(gvc_channel_bar_set_show_mute), (gvc_channel_bar_get_show_mute),
-	(gvc_channel_bar_set_property), (gvc_channel_bar_get_property),
-	(gvc_channel_bar_constructor), (gvc_channel_bar_class_init),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (add_stream):
-	Hide mute in vertical mode.  Add icons to hint at scale direction
-	in horizontal mode.  Fix orientation changing.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_default_source),
-	(gvc_mixer_control_get_sources), (remove_stream), (add_stream),
-	(update_sink), (update_source), (update_sink_input),
-	(update_event_role_stream), (remove_sink), (remove_source),
-	(remove_sink_input), (remove_source_output):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume),
-	(gvc_mixer_source_change_is_muted), (gvc_mixer_source_constructor),
-	(gvc_mixer_source_class_init), (gvc_mixer_source_init),
-	(gvc_mixer_source_finalize), (gvc_mixer_source_new):
-	* src/gvc-mixer-source.h:
-	Add support for input streams.  Only show default input and
-	output stream.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_dispose), (on_control_ready):
-	* src/gvc-channel-bar.c (gvc_channel_bar_finalize):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_event_sink_input),
-	(gvc_mixer_control_get_default_sink),
-	(gvc_mixer_control_lookup_stream_id), (update_sink),
-	(update_sink_input), (update_event_role_stream),
-	(gvc_mixer_control_dispose), (gvc_mixer_control_init):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (on_control_stream_added),
-	(on_control_stream_removed), (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_dispose), (gvc_mixer_dialog_class_init):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_finalize):
-	Fix leaks.  Use ids instead of indexes when possible.
-	Add method to lookup stream by id.
-
-2008-11-04  Marc-André Lureau  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor): Compile
-	with gtk+ <= 2.14.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (on_menu_activate_sounds),
-	(on_status_icon_popup_menu):
-	Add sound properties to menu.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_init):
-	status-icon scroll events only available in gtk+ 2.15.0
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* Makefile.am (SUBDIRS):
-	Add data dir.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/mate-volume-control-applet.desktop.in:
-	Install an autostart file for the volume applet
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* AUTHORS:
-	* Makefile.am:
-	* src/Makefile.am:
-	* src/applet-main.c (on_bus_name_lost), (acquire_name_on_proxy),
-	(acquire_name), (main):
-	* src/dialog-main.c (on_bus_name_lost), (acquire_name_on_proxy),
-	(acquire_name), (on_dialog_response), (on_control_ready), (main):
-	* src/gvc-applet.c (maybe_show_status_icon), (gvc_applet_start),
-	(gvc_applet_dispose), (gvc_applet_constructor),
-	(gvc_applet_class_init), (on_adjustment_value_changed),
-	(popup_dock), (on_status_icon_activate),
-	(on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu), (on_status_icon_scroll_event),
-	(gvc_applet_release_grab), (on_dock_button_press), (popdown_dock),
-	(gvc_applet_grab_notify), (on_dock_grab_notify),
-	(on_dock_grab_broken_event), (on_dock_key_release), (update_icon),
-	(on_stream_volume_notify), (on_stream_is_muted_notify),
-	(on_control_ready), (on_bar_is_muted_notify), (gvc_applet_init),
-	(gvc_applet_finalize), (gvc_applet_new):
-	* src/gvc-applet.h:
-	* src/gvc-channel-bar.c (_scale_box_new), (update_image),
-	(update_label), (gvc_channel_bar_set_name),
-	(gvc_channel_bar_set_icon_name), (gvc_channel_bar_set_orientation),
-	(gvc_channel_bar_set_adjustment), (gvc_channel_bar_get_adjustment),
-	(update_mute_button), (gvc_channel_bar_set_is_muted),
-	(gvc_channel_bar_get_is_muted), (gvc_channel_bar_set_property),
-	(gvc_channel_bar_get_property), (gvc_channel_bar_constructor),
-	(gvc_channel_bar_class_init), (on_mute_button_toggled),
-	(gvc_channel_bar_init), (gvc_channel_bar_finalize),
-	(gvc_channel_bar_new):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_event_sink_input),
-	(gvc_mixer_control_get_default_sink), (listify_hash_values_hfunc),
-	(gvc_stream_collate), (gvc_mixer_control_get_sinks),
-	(gvc_mixer_control_get_sink_inputs), (dec_outstanding),
-	(gvc_mixer_control_is_ready), (update_server), (update_sink),
-	(update_source), (set_icon_name_from_proplist),
-	(update_sink_input), (update_source_output), (update_client),
-	(_pa_context_get_sink_info_cb), (_pa_context_get_source_info_cb),
-	(_pa_context_get_sink_input_info_cb),
-	(_pa_context_get_source_output_info_cb),
-	(_pa_context_get_client_info_cb), (_pa_context_get_server_info_cb),
-	(remove_event_role_stream), (update_event_role_stream),
-	(_pa_ext_stream_restore_read_cb),
-	(_pa_ext_stream_restore_subscribe_cb), (req_update_server_info),
-	(req_update_client_info), (req_update_sink_info),
-	(req_update_source_info), (req_update_sink_input_info),
-	(req_update_source_output_info), (remove_client), (remove_sink),
-	(remove_source), (remove_sink_input), (remove_source_output),
-	(_pa_context_subscribe_cb), (gvc_mixer_control_ready),
-	(_pa_context_state_cb), (gvc_mixer_control_open),
-	(gvc_mixer_control_close), (gvc_mixer_control_dispose),
-	(gvc_mixer_control_constructor), (gvc_mixer_control_class_init),
-	(gvc_mixer_control_init), (gvc_mixer_control_finalize),
-	(gvc_mixer_control_new):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_set_mixer_control),
-	(gvc_mixer_dialog_get_mixer_control),
-	(gvc_mixer_dialog_set_property), (gvc_mixer_dialog_get_property),
-	(on_adjustment_value_changed), (on_bar_is_muted_notify),
-	(lookup_bar_for_stream), (on_stream_volume_notify),
-	(on_stream_is_muted_notify), (save_bar_for_stream), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_class_init),
-	(gvc_mixer_dialog_init), (gvc_mixer_dialog_finalize),
-	(gvc_mixer_dialog_new):
-	* src/gvc-mixer-dialog.h:
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume),
-	(gvc_mixer_sink_input_change_is_muted),
-	(gvc_mixer_sink_input_constructor),
-	(gvc_mixer_sink_input_class_init), (gvc_mixer_sink_input_init),
-	(gvc_mixer_sink_input_finalize), (gvc_mixer_sink_input_new):
-	* src/gvc-mixer-sink-input.h:
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume),
-	(gvc_mixer_sink_change_is_muted), (gvc_mixer_sink_constructor),
-	(gvc_mixer_sink_class_init), (gvc_mixer_sink_init),
-	(gvc_mixer_sink_finalize), (gvc_mixer_sink_new):
-	* src/gvc-mixer-sink.h:
-	* src/gvc-mixer-stream.c (get_next_stream_serial),
-	(gvc_mixer_stream_get_pa_context), (gvc_mixer_stream_get_index),
-	(gvc_mixer_stream_get_id), (gvc_mixer_stream_get_num_channels),
-	(gvc_mixer_stream_get_volume), (gvc_mixer_stream_set_volume),
-	(gvc_mixer_stream_get_is_muted), (gvc_mixer_stream_get_is_default),
-	(gvc_mixer_stream_set_is_muted), (gvc_mixer_stream_set_is_default),
-	(gvc_mixer_stream_get_name), (gvc_mixer_stream_set_name),
-	(gvc_mixer_stream_get_icon_name), (gvc_mixer_stream_set_icon_name),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_constructor),
-	(gvc_mixer_stream_real_change_volume),
-	(gvc_mixer_stream_real_change_is_muted),
-	(gvc_mixer_stream_change_volume),
-	(gvc_mixer_stream_change_is_muted), (gvc_mixer_stream_class_init),
-	(gvc_mixer_stream_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h:
-	Initial commit.
-
diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index 0c3fa4c..93c1bbc 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -1,16 +1,74 @@
 NULL =
 
-SUBDIRS =			\
-	data			\
-	src			\
+bin_PROGRAMS = 						\
+	mate-volume-control-applet			\
+	mate-volume-control				\
 	$(NULL)
 
-EXTRA_DIST = \
-	ChangeLog.pre-2-26	\
+AM_CPPFLAGS =						\
+	$(WARN_CFLAGS)					\
+	$(VOLUME_CONTROL_CFLAGS)			\
+	$(DISABLE_DEPRECATED)				\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
+	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" 	\
+	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
 	$(NULL)
 
-MAINTAINERCLEANFILES =		\
-	*~			\
+noinst_LTLIBRARIES = libmatevolumecontrol.la
+libmatevolumecontrol_la_SOURCES =			\
+	gvc-channel-bar.h				\
+	gvc-channel-bar.c				\
+	gvc-utils.c 					\
+	gvc-utils.h					\
 	$(NULL)
 
+mate_volume_control_applet_LDADD =			\
+	-lm						\
+	libmatevolumecontrol.la				\
+	$(VOLUME_CONTROL_LIBS)				\
+	$(NULL)
+
+mate_volume_control_applet_SOURCES =			\
+	gvc-stream-status-icon.h			\
+	gvc-stream-status-icon.c			\
+	gvc-applet.h					\
+	gvc-applet.c					\
+	applet-main.c					\
+	$(NULL)
+
+mate_volume_control_LDADD =				\
+	-lm						\
+	libmatevolumecontrol.la				\
+	$(VOLUME_CONTROL_LIBS)				\
+	$(NULL)
+
+mate_volume_control_SOURCES =				\
+	gvc-balance-bar.h				\
+	gvc-balance-bar.c				\
+	gvc-level-bar.h					\
+	gvc-level-bar.c					\
+	gvc-combo-box.h					\
+	gvc-combo-box.c					\
+	gvc-sound-theme-chooser.c 			\
+	gvc-sound-theme-chooser.h 			\
+	gvc-speaker-test.h				\
+	gvc-speaker-test.c				\
+	sound-theme-file-utils.c			\
+	sound-theme-file-utils.h			\
+	gvc-mixer-dialog.c				\
+	gvc-mixer-dialog.h				\
+	dialog-main.c					\
+	$(NULL)
+
+BUILT_SOURCES =						\
+	$(NULL)
+
+CLEANFILES =						\
+	$(BUILT_SOURCES)				\
+	$(NULL)
+
+MAINTAINERCLEANFILES =					\
+	*~						\
+	Makefile.in
+
 -include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/src/applet-main.c b/mate-volume-control/applet-main.c
index 1b4bb0a..1b4bb0a 100644
--- a/mate-volume-control/src/applet-main.c
+++ b/mate-volume-control/applet-main.c
diff --git a/mate-volume-control/data/Makefile.am b/mate-volume-control/data/Makefile.am
deleted file mode 100644
index c580a45..0000000
--- a/mate-volume-control/data/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-NULL =
-
-SUBDIRS =			\
-	icons			\
-	$(NULL)
-
-@INTLTOOL_DESKTOP_RULE@
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = mate-volume-control-applet.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-appsdir = $(datadir)/applications
-apps_in_files = mate-volume-control.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-
-EXTRA_DIST =					\
-	$(autostart_in_files)			\
-	mate-volume-control.desktop.in.in	\
-	$(NULL)
-
-CLEANFILES =					\
-	mate-volume-control.desktop		\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	mate-volume-control-applet.desktop	\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/16x16/Makefile.am b/mate-volume-control/data/icons/16x16/Makefile.am
deleted file mode 100644
index 05a9700..0000000
--- a/mate-volume-control/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/16x16/status/Makefile.am b/mate-volume-control/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index 041fb3b..0000000
--- a/mate-volume-control/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = 16x16
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-high.png b/mate-volume-control/data/icons/16x16/status/audio-input-microphone-high.png
deleted file mode 100644
index 160d2b8..0000000
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-high.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-low.png b/mate-volume-control/data/icons/16x16/status/audio-input-microphone-low.png
deleted file mode 100644
index b08ab64..0000000
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-low.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-medium.png b/mate-volume-control/data/icons/16x16/status/audio-input-microphone-medium.png
deleted file mode 100644
index 48a4c05..0000000
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-medium.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-muted.png b/mate-volume-control/data/icons/16x16/status/audio-input-microphone-muted.png
deleted file mode 100644
index 7aed52c..0000000
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-muted.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/22x22/Makefile.am b/mate-volume-control/data/icons/22x22/Makefile.am
deleted file mode 100644
index 05a9700..0000000
--- a/mate-volume-control/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/22x22/status/Makefile.am b/mate-volume-control/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index 53b0a3a..0000000
--- a/mate-volume-control/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = 22x22
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-high.png b/mate-volume-control/data/icons/22x22/status/audio-input-microphone-high.png
deleted file mode 100644
index ca3770f..0000000
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-high.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-low.png b/mate-volume-control/data/icons/22x22/status/audio-input-microphone-low.png
deleted file mode 100644
index 75d0612..0000000
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-low.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-medium.png b/mate-volume-control/data/icons/22x22/status/audio-input-microphone-medium.png
deleted file mode 100644
index c1efeb5..0000000
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-medium.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-muted.png b/mate-volume-control/data/icons/22x22/status/audio-input-microphone-muted.png
deleted file mode 100644
index 9f3dd3c..0000000
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-muted.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/24x24/Makefile.am b/mate-volume-control/data/icons/24x24/Makefile.am
deleted file mode 100644
index 05a9700..0000000
--- a/mate-volume-control/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/24x24/status/Makefile.am b/mate-volume-control/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 9ea93cd..0000000
--- a/mate-volume-control/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = 24x24
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-high.png b/mate-volume-control/data/icons/24x24/status/audio-input-microphone-high.png
deleted file mode 100644
index fe10ab2..0000000
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-high.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-low.png b/mate-volume-control/data/icons/24x24/status/audio-input-microphone-low.png
deleted file mode 100644
index ee180d8..0000000
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-low.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-medium.png b/mate-volume-control/data/icons/24x24/status/audio-input-microphone-medium.png
deleted file mode 100644
index eb6aa28..0000000
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-medium.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-muted.png b/mate-volume-control/data/icons/24x24/status/audio-input-microphone-muted.png
deleted file mode 100644
index b969738..0000000
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-muted.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/32x32/Makefile.am b/mate-volume-control/data/icons/32x32/Makefile.am
deleted file mode 100644
index 05a9700..0000000
--- a/mate-volume-control/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/32x32/status/Makefile.am b/mate-volume-control/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 68afbb7..0000000
--- a/mate-volume-control/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = 32x32
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-high.png b/mate-volume-control/data/icons/32x32/status/audio-input-microphone-high.png
deleted file mode 100644
index 8bd9d5b..0000000
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-high.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-low.png b/mate-volume-control/data/icons/32x32/status/audio-input-microphone-low.png
deleted file mode 100644
index 8a09c9f..0000000
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-low.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-medium.png b/mate-volume-control/data/icons/32x32/status/audio-input-microphone-medium.png
deleted file mode 100644
index a45c79c..0000000
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-medium.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-muted.png b/mate-volume-control/data/icons/32x32/status/audio-input-microphone-muted.png
deleted file mode 100644
index 8161f1f..0000000
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-muted.png
+++ /dev/null
diff --git a/mate-volume-control/data/icons/Makefile.am b/mate-volume-control/data/icons/Makefile.am
deleted file mode 100644
index 67d9cea..0000000
--- a/mate-volume-control/data/icons/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-NULL =
-
-SUBDIRS = \
-	scalable \
-	16x16 \
-	22x22 \
-	24x24 \
-	32x32 \
-	$(NULL)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/mate
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/scalable/Makefile.am b/mate-volume-control/data/icons/scalable/Makefile.am
deleted file mode 100644
index 2cf31cf..0000000
--- a/mate-volume-control/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/scalable/devices/Makefile.am b/mate-volume-control/data/icons/scalable/devices/Makefile.am
deleted file mode 100644
index e22cb77..0000000
--- a/mate-volume-control/data/icons/scalable/devices/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = 48x48
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-speaker-center.svg		\
-	audio-speaker-center-testing.svg	\
-	audio-speaker-left-back.svg		\
-	audio-speaker-left-back-testing.svg	\
-	audio-speaker-left.svg			\
-	audio-speaker-left-side.svg		\
-	audio-speaker-left-side-testing.svg	\
-	audio-speaker-left-testing.svg		\
-	audio-speaker-right-back.svg		\
-	audio-speaker-right-back-testing.svg	\
-	audio-speaker-right.svg			\
-	audio-speaker-right-side.svg		\
-	audio-speaker-right-side-testing.svg	\
-	audio-speaker-right-testing.svg		\
-	audio-speaker-center-back-testing.svg	\
-	audio-speaker-center-back.svg		\
-	audio-subwoofer.svg			\
-	audio-subwoofer-testing.svg		\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back-testing.svg
deleted file mode 100644
index 93afe0b..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back-testing.svg
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   version="1.0"
-   sodipodi:docname="audio-speaker-center-back-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-side-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="977"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>center</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-center-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(1,0,0,-1,-50.334601,47.958369)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="m 64.325669,10.506413 c 6.07143,-3.4821397 13.14286,-3.3928497 19.39286,0 l 2,4.39286 -23.39286,0 2,-4.39286 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="m 95.897099,27.934983 c 0,0 -4.54743,-8.68677 -9.8613,-12.93926 -0.21063,-0.16856 -0.42247,-0.33016 -0.63527,-0.48397 -0.50204,-0.36286 -1.00946,-0.68239 -1.51919,-0.94787 -0.56896,-0.29634 -1.14078,-0.52533 -1.71117,-0.67205 -3.88321,-1.01934 -11.71652,-1.06249 -15.58966,-0.04613 -0.83989,0.21914 -1.6816,0.61173 -2.51203,1.13191 -0.62524,0.39166 -1.24409,0.85564 -1.85095,1.37236 -1.87112,1.5932 -3.628309,3.68784 -5.107769,5.71001 -2.59659,3.54911 -4.33766,6.875 -4.33766,6.875"
-         style="fill:none;stroke:none"
-         id="path8494" />
-      <path
-         style="fill:none;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 62.827469,15.979023 2.18704,-4.766 c 5.261057,-2.7432797 11.220313,-3.3671697 17.939063,-0.0056 l 1.96851,4.2035"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="m 95.001579,28.523883 c 0,0 -6.30803,-12.92857 -13.07068,-14.66816 -3.88321,-1.01933 -11.18527,-1.06248 -15.05841,-0.04613 -6.84412,1.78572 -11.839659,12.46429 -11.839659,12.46429"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="m 43.214285,32.24107 c 0,2.736768 -9.374038,4.955357 -20.9375,4.955357 -11.563462,0 -20.9375001,-2.218589 -20.9375001,-4.955357 0,-2.736768 9.3740381,-4.955357 20.9375001,-4.955357 11.563462,0 20.9375,2.218589 20.9375,4.955357 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="m 95.16001,29.859216 c 0.1894,4.408221 -8.80985,9.066057 -20.909493,9.066057 -12.099643,0 -21.130461,-4.594701 -20.90949,-9.066057 -0.189403,-4.566056 8.809847,-9.034489 20.90949,-9.034489 12.099643,0 20.941063,4.37373 20.909493,9.034489 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 82.142459,27.943913 c -0.67407,2.18776 -3.2897,3.38538 -7.80786,3.38538 -4.51815,0 -7.3487,-1.37717 -7.80786,-3.38538 -0.07073,-1.70502 3.28971,-3.37359 7.80786,-3.37359 4.51816,0 7.81965,1.63321 7.80786,3.37359 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 67.476989,27.764793 c 0.9704,3.07926 3.66898,5.29604 6.84343,5.29605 3.19412,0 5.90648,-2.24438 6.86128,-5.35345 -0.90064,-1.50063 -4.28117,-2.23685 -6.89061,-2.19358 -3.30434,-0.08574 -5.85648,0.85968 -6.8141,2.25098 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 62.722179,14.847493 c -0.12704,0.1026 -0.3786,0.39515 -0.50465,0.50248 -1.87112,1.5932 -3.628309,3.68784 -5.107769,5.71001 -2.59659,3.54911 -4.33766,6.875 -4.33766,6.875 m 43.124999,0 c 0,0 -4.54743,-8.68677 -9.8613,-12.93926 -0.21063,-0.16856 -0.42247,-0.33016 -0.63527,-0.48397 -0.10052,-0.07265 -0.648157,-0.29253 -0.749077,-0.36162"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 81.930899,13.855723 c -3.88321,-1.01933 -11.18527,-1.06248 -15.05841,-0.04613"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back.svg
deleted file mode 100644
index 7d278f8..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back.svg
+++ /dev/null
@@ -1,506 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   version="1.0"
-   sodipodi:docname="audio-speaker-center-back.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-53.025818"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="977"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>center</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-center</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(1,0,0,-1,-0.04163061,47.958369)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="m 14.032699,10.506413 c 6.07143,-3.4821397 13.14286,-3.3928497 19.39286,0 l 2,4.39286 -23.39286,0 2,-4.39286 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="m 45.604129,27.934983 c 0,0 -4.54743,-8.68677 -9.8613,-12.93926 -0.21063,-0.16856 -0.42247,-0.33016 -0.63527,-0.48397 -0.50204,-0.36286 -1.00946,-0.68239 -1.51919,-0.94787 -0.56896,-0.29634 -1.14078,-0.52533 -1.71117,-0.67205 -3.88321,-1.01934 -11.71652,-1.06249 -15.58966,-0.04613 -0.83989,0.21914 -1.6816,0.61173 -2.51203,1.13191 -0.62524,0.39166 -1.24409,0.85564 -1.85095,1.37236 -1.87112,1.5932 -3.6283094,3.68784 -5.1077694,5.71001 -2.59659,3.54911 -4.33766,6.875 -4.33766,6.875"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path5367" />
-      <path
-         style="fill:none;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 12.534499,15.979023 2.18704,-4.766 c 5.261057,-2.7432797 11.220313,-3.3671697 17.939063,-0.0056 l 1.96851,4.2035"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="m 44.708609,28.523883 c 0,0 -6.30803,-12.92857 -13.07068,-14.66816 -3.88321,-1.01933 -11.18527,-1.06248 -15.05841,-0.04613 -6.8441198,1.78572 -11.8396594,12.46429 -11.8396594,12.46429"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="m 43.214285,32.24107 c 0,2.736768 -9.374038,4.955357 -20.9375,4.955357 -11.563462,0 -20.9375001,-2.218589 -20.9375001,-4.955357 0,-2.736768 9.3740381,-4.955357 20.9375001,-4.955357 11.563462,0 20.9375,2.218589 20.9375,4.955357 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 44.951119,29.943913 c 0.18941,4.40822 -8.80985,9.06606 -20.90949,9.06606 -12.09964,0 -21.1304594,-4.5947 -20.9094894,-9.06606 -0.1894,-4.56606 8.8098494,-9.03449 20.9094894,-9.03449 12.09964,0 20.94106,4.37373 20.90949,9.03449 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 31.849489,27.943913 c -0.67407,2.18776 -3.2897,3.38538 -7.80786,3.38538 -4.51815,0 -7.3487,-1.37717 -7.80786,-3.38538 -0.07073,-1.70502 3.28971,-3.37359 7.80786,-3.37359 4.51816,0 7.81965,1.63321 7.80786,3.37359 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 17.184019,27.764793 c 0.9704,3.07926 3.66898,5.29604 6.84343,5.29605 3.19412,0 5.90648,-2.24438 6.86128,-5.35345 -0.90064,-1.50063 -4.28117,-2.23685 -6.89061,-2.19358 -3.30434,-0.08574 -5.85648,0.85968 -6.8141,2.25098 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 12.429209,14.847493 c -0.12704,0.1026 -0.3786,0.39515 -0.50465,0.50248 -1.87112,1.5932 -3.6283094,3.68784 -5.1077694,5.71001 -2.59659,3.54911 -4.33766,6.875 -4.33766,6.875 m 43.1249994,0 c 0,0 -4.54743,-8.68677 -9.8613,-12.93926 -0.21063,-0.16856 -0.42247,-0.33016 -0.63527,-0.48397 -0.10052,-0.07265 -0.648157,-0.29253 -0.749077,-0.36162"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 31.637929,13.855723 c -3.88321,-1.01933 -11.18527,-1.06248 -15.05841,-0.04613"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-testing.svg
deleted file mode 100644
index 09f40bc..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-center-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-side-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>center</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-center-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="translate(-50.334601,4.1631076e-2)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-center.svg
deleted file mode 100644
index 886b4b8..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-center.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-53.025818"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="25"
-     inkscape:window-y="21"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>center</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-center</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="translate(-4.1630606e-2,4.1631076e-2)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back-testing.svg
deleted file mode 100644
index e1618fc..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left-back-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left-back</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left-b-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(-0.7071068,-0.7071068,0.7071068,-0.7071068,57.052876,95.851156)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back.svg
deleted file mode 100644
index d7a6f43..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left-back.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-53.376308"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left-back</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left-back</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(-0.7071068,-0.7071068,0.7071068,-0.7071068,21.490375,60.288654)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side-testing.svg
deleted file mode 100644
index ad0f430..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left-side-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-right-side-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left-side</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left-side-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(0,-1,1,0,4.1631076e-2,98.334601)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side.svg
deleted file mode 100644
index 4851454..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left-side.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-side.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-15.988037"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left-side</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left-side</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(0,-1,1,0,4.1631076e-2,48.041631)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-testing.svg
deleted file mode 100644
index 7b9316f..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-back-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(-0.7071068,0.7071068,0.7071068,0.7071068,57.052876,-47.851155)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-left.svg
deleted file mode 100644
index 1ee3869..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-left.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-right.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-53.376308"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>left</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-left</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(-0.7071068,0.7071068,0.7071068,0.7071068,21.490375,-12.288654)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back-testing.svg
deleted file mode 100644
index 0f633a9..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right-back-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-back-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right-back</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right-back-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(0.7071068,-0.7071068,-0.7071068,-0.7071068,-9.0528759,95.851156)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back.svg
deleted file mode 100644
index ba1dead..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right-back.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-left-back.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-53.376308"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right-back</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right-back</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(0.7071068,-0.7071068,-0.7071068,-0.7071068,26.509625,60.288654)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side-testing.svg
deleted file mode 100644
index 577dd86..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side-testing.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right-side-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-right-back-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right-side</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right-side-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(0,-1,-1,0,47.958369,98.334601)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side.svg
deleted file mode 100644
index be6a746..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right-side.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-right-back.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-15.988037"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right-side</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right-side</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(0,-1,-1,0,47.958369,48.041631)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-testing.svg
deleted file mode 100644
index 3a4e903..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-testing.svg
+++ /dev/null
@@ -1,913 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker-right-testing.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(11.322482,0,0,3.7410569,-790.12434,122.56351)"
-       cx="14.790665"
-       cy="29.860626"
-       fx="14.790665"
-       fy="29.860626"
-       r="1.1399525" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(10.171038,0,0,5.2502725,-797.43964,77.21735)"
-       cx="17.797972"
-       cy="29.948833"
-       fx="17.797972"
-       fy="29.948833"
-       r="1.945146" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6377">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop6379" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="1"
-         id="stop6381" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(15.4058,0,0,6.5714191,-930.81786,37.58535)"
-       cx="20.818829"
-       cy="29.948536"
-       fx="20.818829"
-       fy="29.948536"
-       r="2.5451017" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5935"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0714931,0,0,1.2212999,-677.47231,206.91558)"
-       x1="21.875"
-       y1="9.6335878"
-       x2="20.5"
-       y2="41.744865" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="linearGradient5933"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0714931,0,0,1.2212999,-677.47231,206.91558)"
-       x1="20.087172"
-       y1="6.6629219"
-       x2="20.91938"
-       y2="38.337017" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5931"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6831088,0,0,1.0329054,-652.67404,212.26374)"
-       x1="4.5961943"
-       y1="14.456622"
-       x2="4.5961943"
-       y2="30.313524" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="linearGradient5929"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7679166,0,0,1.687933,-652.72155,185.35433)"
-       x1="2.6850162"
-       y1="24.367676"
-       x2="2.9248238"
-       y2="35.053852" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient21582">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop21584" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop21586" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21582"
-       id="linearGradient5927"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0102994,0,0,1.2565202,-654.12827,206.16954)"
-       x1="21.875"
-       y1="26.625"
-       x2="18.187626"
-       y2="26" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient21598">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop21600" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop21602" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21598"
-       id="linearGradient5925"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7830101,0,0,0.9810567,-652.01527,212.32101)"
-       x1="12.25"
-       y1="19.75"
-       x2="10.875"
-       y2="33.125" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="radialGradient5923"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.433087,-0.596698,0.798238,1.917124,-20.96864,-16.43019)"
-       cx="7.001297"
-       cy="22.470087"
-       fx="7.001297"
-       fy="22.470087"
-       r="6.4940691" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10872"
-       id="linearGradient5921"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0102994,0,0,1.0172401,-654.21562,212.46274)"
-       x1="3.8890872"
-       y1="18.937069"
-       x2="3.8890872"
-       y2="25.947107" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5919"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99664,0,0,1.1932745,-655.42965,207.54612)"
-       x1="11.875"
-       y1="20.375"
-       x2="13.125"
-       y2="34.13559" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6371"
-       id="linearGradient5917"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99664,0,0,1.1932745,-655.42965,207.54612)"
-       x1="14.241117"
-       y1="26.996773"
-       x2="15.125"
-       y2="20.976084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21608"
-       id="linearGradient5915"
-       gradientUnits="userSpaceOnUse"
-       x1="23.272787"
-       y1="18.525478"
-       x2="23.272787"
-       y2="22.811184" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15341"
-       id="radialGradient5913"
-       gradientUnits="userSpaceOnUse"
-       cx="22.624176"
-       cy="20.880224"
-       fx="22.624176"
-       fy="20.880224"
-       r="3.3177083" />
-    <linearGradient
-       id="linearGradient3529">
-      <stop
-         id="stop3531"
-         offset="0"
-         style="stop-color:#fefefe;stop-opacity:1;" />
-      <stop
-         id="stop3533"
-         offset="1"
-         style="stop-color:#e8e7e6;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3529"
-       id="radialGradient5911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2876712,0,13.845354)"
-       cx="7.9549513"
-       cy="19.436747"
-       fx="7.9549513"
-       fy="19.436747"
-       r="6.4523492" />
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="radialGradient5554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.725459,40.419065)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient8512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3529"
-       id="radialGradient5708"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2876712,0,13.845354)"
-       cx="7.9549513"
-       cy="19.436747"
-       fx="7.9549513"
-       fy="19.436747"
-       r="6.4523492" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15341"
-       id="radialGradient5710"
-       gradientUnits="userSpaceOnUse"
-       cx="22.624176"
-       cy="20.880224"
-       fx="22.624176"
-       fy="20.880224"
-       r="3.3177083" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21608"
-       id="linearGradient5712"
-       gradientUnits="userSpaceOnUse"
-       x1="23.272787"
-       y1="18.525478"
-       x2="23.272787"
-       y2="22.811184" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="radialGradient5720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.433087,-0.596698,0.798238,1.917124,-20.96864,-16.43019)"
-       cx="7.001297"
-       cy="22.470087"
-       fx="7.001297"
-       fy="22.470087"
-       r="6.4940691" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5744"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-8.0062038,8.0062038,-2.6453267,-2.6453267,292.61535,-42.156174)"
-       cx="14.790665"
-       cy="29.860626"
-       fx="14.790665"
-       fy="29.860626"
-       r="1.1399525" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-7.1920099,7.1920099,-3.7125033,-3.7125033,329.85262,-15.264295)"
-       cx="17.797972"
-       cy="29.948833"
-       fx="17.797972"
-       fy="29.948833"
-       r="1.945146" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6377"
-       id="radialGradient5750"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-10.893546,10.893546,-4.646695,-4.646695,452.18932,-81.552883)"
-       cx="20.818829"
-       cy="29.948536"
-       fx="20.818829"
-       fy="29.948536"
-       r="2.5451017" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="linearGradient5753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0714931,0,0,1.2212999,31.77769,-26.9466)"
-       x1="20.087172"
-       y1="6.6629219"
-       x2="20.91938"
-       y2="38.337017" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0714931,0,0,1.2212999,31.77769,-26.9466)"
-       x1="21.875"
-       y1="9.6335878"
-       x2="20.5"
-       y2="41.744865" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10055"
-       id="linearGradient5758"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7679166,0,0,1.687933,56.52845,-48.50785)"
-       x1="2.6850162"
-       y1="24.367676"
-       x2="2.9248238"
-       y2="35.053852" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5760"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6831088,0,0,1.0329054,56.57596,-21.59844)"
-       x1="4.5961943"
-       y1="14.456622"
-       x2="4.5961943"
-       y2="30.313524" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21582"
-       id="linearGradient5763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0102994,0,0,1.2565202,55.12173,-27.69264)"
-       x1="21.875"
-       y1="26.625"
-       x2="18.187626"
-       y2="26" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21598"
-       id="linearGradient5766"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7830101,0,0,0.9810567,57.23473,-21.54117)"
-       x1="12.25"
-       y1="19.75"
-       x2="10.875"
-       y2="33.125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10872"
-       id="linearGradient5770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0102994,0,0,1.0172401,55.03438,-21.39944)"
-       x1="3.8890872"
-       y1="18.937069"
-       x2="3.8890872"
-       y2="25.947107" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6371"
-       id="linearGradient5773"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99664,0,0,1.1932745,53.82035,-26.31606)"
-       x1="14.241117"
-       y1="26.996773"
-       x2="15.125"
-       y2="20.976084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5254"
-       id="linearGradient5775"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99664,0,0,1.1932745,53.82035,-26.31606)"
-       x1="11.875"
-       y1="20.375"
-       x2="13.125"
-       y2="34.13559" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5928"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,97.72545,40.294064)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="126.80533"
-     inkscape:cy="41.532441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="-12"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-14.142136,73.185552"
-       id="guide3490" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-21,-23.25"
-       id="guide5857" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49.5,-22.625"
-       id="guide5859" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g8490"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,-9.0528759,-47.851156)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8492"
-         d="M 64.325669,10.506413 C 70.397099,7.0242733 77.468529,7.1135633 83.718529,10.506413 L 85.718529,14.899273 L 62.325669,14.899273 L 64.325669,10.506413 z"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 84.898489,14.148893 84.391069,13.829363 83.881339,13.563883 C 83.312379,13.267543 82.740559,13.038553 82.170169,12.891833 C 78.286959,11.872493 70.453649,11.829343 66.580509,12.845703 C 65.740619,13.064843 64.898909,13.457433 64.068479,13.977613 C 63.443239,14.369273 62.824389,14.833253 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8494" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.827469,15.979023 L 65.014509,11.213023 C 70.275566,8.4697433 76.234822,7.8458533 82.953572,11.207463 L 84.922082,15.410963"
-         id="path8496"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 95.001579,28.523883 C 95.001579,28.523883 88.693549,15.595313 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593 C 60.028369,15.595313 55.03283,26.273883 55.03283,26.273883"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path8498" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,51.01285,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path8500"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path8502"
-         d="M 95.16001,29.859216 C 95.34941,34.267437 86.35016,38.925273 74.250517,38.925273 C 62.150874,38.925273 53.120056,34.330572 53.341027,29.859216 C 53.151624,25.29316 62.150874,20.824727 74.250517,20.824727 C 86.35016,20.824727 95.19158,25.198457 95.16001,29.859216 z"
-         style="fill:url(#radialGradient8512);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 82.142459,27.943913 C 81.468389,30.131673 78.852759,31.329293 74.334599,31.329293 C 69.816449,31.329293 66.985899,29.952123 66.526739,27.943913 C 66.456009,26.238893 69.816449,24.570323 74.334599,24.570323 C 78.852759,24.570323 82.154249,26.203533 82.142459,27.943913 z"
-         id="path8504"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 67.476989,27.764793 C 68.447389,30.844053 71.145969,33.060833 74.320419,33.060843 C 77.514539,33.060843 80.226899,30.816463 81.181699,27.707393 C 80.281059,26.206763 76.900529,25.470543 74.291089,25.513813 C 70.986749,25.428073 68.434609,26.373493 67.476989,27.764793 z"
-         id="path8506"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path8508"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 62.722179,14.847493 C 62.595139,14.950093 62.343579,15.242643 62.217529,15.349973 C 60.346409,16.943173 58.58922,19.037813 57.10976,21.059983 C 54.51317,24.609093 52.7721,27.934983 52.7721,27.934983 M 95.897099,27.934983 C 95.897099,27.934983 91.349669,19.248213 86.035799,14.995723 C 85.825169,14.827163 85.613329,14.665563 85.400529,14.511753 C 85.300009,14.439103 84.752372,14.219223 84.651452,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path8510"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bfd8f3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 81.930899,13.855723 C 78.047689,12.836393 70.745629,12.793243 66.872489,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right.svg b/mate-volume-control/data/icons/scalable/devices/audio-speaker-right.svg
deleted file mode 100644
index bde2e35..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-speaker-right.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-speaker.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4325">
-      <stop
-         id="stop4327"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21608">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop21610" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop21612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15341">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop15343" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop15345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6371">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="0"
-         id="stop6373" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="1"
-         id="stop6375" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10872">
-      <stop
-         id="stop10874"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e9e92;stop-opacity:1;"
-         offset="0.25301206"
-         id="stop10876" />
-      <stop
-         id="stop10878"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254">
-      <stop
-         id="stop5256"
-         offset="0"
-         style="stop-color:#707469;stop-opacity:1;" />
-      <stop
-         id="stop5258"
-         offset="1"
-         style="stop-color:#2e3335;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10055">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop10057" />
-      <stop
-         id="stop10061"
-         offset="0.375"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop10059" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4841">
-      <stop
-         id="stop4843"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:0.94117647;"
-         offset="0"
-         id="stop4845" />
-      <stop
-         id="stop4847"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop4849" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop4811" />
-      <stop
-         id="stop4813"
-         offset="0"
-         style="stop-color:#ad7fa8;stop-opacity:1;" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop4815" />
-      <stop
-         id="stop4817"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3223">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3225" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="1"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop3239" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3501"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2366258,0,24.617945)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.474934,42.420392)"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138"
-       spreadMethod="reflect" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0469084,0,0,0.4796469,270.37856,38.427671)"
-       cx="22.276291"
-       cy="32.248856"
-       fx="22.276291"
-       fy="32.248856"
-       r="20.319138" />
-    <inkscape:perspective
-       id="perspective3474"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient4359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-52.447261,-106.14795)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,42.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient5062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4325"
-       id="radialGradient5064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,98.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,142.72007,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,92.720075,-107.89847)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient7260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,47.516569,40.378763)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-90.590866"
-     inkscape:cy="20.556657"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1601"
-     inkscape:window-height="942"
-     inkscape:window-x="5"
-     inkscape:window-y="1"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>speaker</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>right</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-speaker-right</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g7248"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,26.509625,-12.288654)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path5365"
-         d="M 14.032699,10.506413 C 20.104129,7.0242733 27.175559,7.1135633 33.425559,10.506413 L 35.425559,14.899273 L 12.032699,14.899273 L 14.032699,10.506413 z"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssccsssc"
-         d="M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 34.605519,14.148893 34.098099,13.829363 33.588369,13.563883 C 33.019409,13.267543 32.447589,13.038553 31.877199,12.891833 C 27.993989,11.872493 20.160679,11.829343 16.287539,12.845703 C 15.447649,13.064843 14.605939,13.457433 13.775509,13.977613 C 13.150269,14.369273 12.531419,14.833253 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983"
-         style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5367" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a83;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 12.534499,15.979023 L 14.721539,11.213023 C 19.982596,8.4697433 25.941852,7.8458533 32.660602,11.207463 L 34.629112,15.410963"
-         id="path5369"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="M 44.708609,28.523883 C 44.708609,28.523883 38.400579,15.595313 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593 C 9.7353992,15.595313 4.7398596,26.273883 4.7398596,26.273883"
-         style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path5371" />
-      <path
-         transform="matrix(1.0469083,0,0,2.027027,0.7198796,-35.409607)"
-         d="M 43.214285,32.24107 A 20.9375,4.9553571 0 1 1 1.3392849,32.24107 A 20.9375,4.9553571 0 1 1 43.214285,32.24107 z"
-         sodipodi:ry="4.9553571"
-         sodipodi:rx="20.9375"
-         sodipodi:cy="32.24107"
-         sodipodi:cx="22.276785"
-         id="path5373"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.68646109;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:url(#radialGradient7260);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 44.951119,29.943913 C 45.140529,34.352133 36.141269,39.009973 24.041629,39.009973 C 11.941989,39.009973 2.9111696,34.415273 3.1321396,29.943913 C 2.9427396,25.377853 11.941989,20.909423 24.041629,20.909423 C 36.141269,20.909423 44.982689,25.283153 44.951119,29.943913 z"
-         id="path5375"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 31.849489,27.943913 C 31.175419,30.131673 28.559789,31.329293 24.041629,31.329293 C 19.523479,31.329293 16.692929,29.952123 16.233769,27.943913 C 16.163039,26.238893 19.523479,24.570323 24.041629,24.570323 C 28.559789,24.570323 31.861279,26.203533 31.849489,27.943913 z"
-         id="path5377"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.96596354;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 17.184019,27.764793 C 18.154419,30.844053 20.852999,33.060833 24.027449,33.060843 C 27.221569,33.060843 29.933929,30.816463 30.888729,27.707393 C 29.988089,26.206763 26.607559,25.470543 23.998119,25.513813 C 20.693779,25.428073 18.141639,26.373493 17.184019,27.764793 z"
-         id="path5379"
-         sodipodi:nodetypes="csccc"
-         inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_Test.png"
-         inkscape:export-xdpi="67.489998"
-         inkscape:export-ydpi="67.489998" />
-      <path
-         id="path5381"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 12.429209,14.847493 C 12.302169,14.950093 12.050609,15.242643 11.924559,15.349973 C 10.053439,16.943173 8.2962496,19.037813 6.8167896,21.059983 C 4.2201996,24.609093 2.4791296,27.934983 2.4791296,27.934983 M 45.604129,27.934983 C 45.604129,27.934983 41.056699,19.248213 35.742829,14.995723 C 35.532199,14.827163 35.320359,14.665563 35.107559,14.511753 C 35.007039,14.439103 34.459402,14.219223 34.358482,14.150133"
-         sodipodi:nodetypes="cssccsss" />
-      <path
-         id="path5383"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 31.637929,13.855723 C 27.754719,12.836393 20.452659,12.793243 16.579519,13.809593"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer-testing.svg b/mate-volume-control/data/icons/scalable/devices/audio-subwoofer-testing.svg
deleted file mode 100644
index 6ae74ba..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer-testing.svg
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-subwoofer-testing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/audio-subwoofer-testing.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient6718">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop6720" />
-      <stop
-         id="stop6724"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         id="stop3505"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6984"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-48.821714"
-     inkscape:cy="66.867859"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>subwoofer</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>testing</rdf:li>
-            <rdf:li>highlighted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-subwoofer-testing</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g6973"
-       transform="translate(-51.375,9.0155254e-8)">
-      <path
-         style="fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 94.217316,39.045143 C 93.839661,41.471941 92.789441,43.219015 91.55403,43.219015 C 90.310955,43.219015 89.255378,41.450202 88.883794,38.999908 C 89.234301,37.817247 90.549918,37.23702 91.565441,37.271125 C 92.851403,37.203551 93.844629,37.948644 94.217316,39.045143 z"
-         id="path6730"
-         sodipodi:nodetypes="csccc" />
-      <path
-         sodipodi:nodetypes="csccc"
-         id="path6732"
-         d="M 62.393985,39.045143 C 62.016329,41.471941 60.96611,43.219015 59.730698,43.219015 C 58.487624,43.219015 57.432046,41.450202 57.060462,38.999908 C 57.410969,37.817247 58.726586,37.23702 59.742109,37.271125 C 61.028072,37.203551 62.021297,37.948644 62.393985,39.045143 z"
-         style="fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1.28661346;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 62.953967,6.9788731 C 73.409478,4.1293728 77.293929,4.3517447 87.917557,6.9788731 L 95.317117,13.152471 L 55.554408,13.152471 L 62.953967,6.9788731 z"
-         id="path6734"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 55.289577,13.137135 C 67.861736,9.7856746 82.504598,9.8716096 95.446529,13.137135 L 95.389975,39.76734 C 82.177445,42.114593 68.287824,42.159732 55.346132,39.902758 L 55.289577,13.137135 z"
-         id="path6736"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient6984);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:2.05839419;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path6738"
-         sodipodi:cx="84.365685"
-         sodipodi:cy="64.927307"
-         sodipodi:rx="21.396112"
-         sodipodi:ry="21.396112"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         transform="matrix(0,0.4858156,-0.4858156,0,100.43255,-14.78506)" />
-      <path
-         transform="matrix(0,0.2827849,-0.2827849,0,105.0933,2.3437637)"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         sodipodi:ry="21.396112"
-         sodipodi:rx="21.396112"
-         sodipodi:cy="64.927307"
-         sodipodi:cx="84.365685"
-         id="path6740"
-         style="fill:#bfd8f3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.53625679;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:5.06734753;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path6742"
-         sodipodi:cx="84.365685"
-         sodipodi:cy="64.927307"
-         sodipodi:rx="21.396112"
-         sodipodi:ry="21.396112"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         transform="matrix(0,0.1973419,-0.1973419,0,99.523923,9.5522206)" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path6744"
-         d="M 56.321159,13.950789 C 67.82398,10.961669 81.161179,10.935259 94.415609,13.950789 L 94.359059,38.893489 C 81.01047,40.978079 68.381909,41.160879 56.377709,39.028909 L 56.321159,13.950789 z"
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bfd8f3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         transform="matrix(0,0.1973419,-0.1973419,0,81.702733,9.5522212)"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         sodipodi:ry="21.396112"
-         sodipodi:rx="21.396112"
-         sodipodi:cy="64.927307"
-         sodipodi:cx="84.365685"
-         id="path6746"
-         style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:5.06734753;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer.svg b/mate-volume-control/data/icons/scalable/devices/audio-subwoofer.svg
deleted file mode 100644
index dbed916..0000000
--- a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer.svg
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2643"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="audio-subwoofer.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/eve/Documents/MATE/SpeakerIcon_subwoofer.png"
-   inkscape:export-xdpi="67.489998"
-   inkscape:export-ydpi="67.489998">
-  <defs
-     id="defs2645">
-    <linearGradient
-       id="linearGradient6718">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop6720" />
-      <stop
-         id="stop6724"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3347"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3351" />
-      <stop
-         id="stop3355"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3349" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4389">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4391" />
-      <stop
-         id="stop4393"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient5385"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0538312,-6.3027391e-8,1.2877417e-8,-0.7232676,-9.0519739,70.961132)"
-       spreadMethod="pad"
-       cx="22.276297"
-       cy="21.099283"
-       fx="22.276297"
-       fy="21.099283"
-       r="20.319138" />
-    <linearGradient
-       id="linearGradient3503">
-      <stop
-         id="stop3505"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         id="stop3507"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2651" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6516"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3503"
-       id="radialGradient6705"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7451713,-0.7451712,0.5114274,0.5114274,10.506623,78.557248)"
-       spreadMethod="reflect"
-       cx="22.276291"
-       cy="21.520338"
-       fx="22.276291"
-       fy="21.520338"
-       r="20.319138" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6718"
-       id="radialGradient6716"
-       gradientUnits="userSpaceOnUse"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578"
-       gradientTransform="matrix(0.8545182,0,0,0.753115,12.273671,16.029579)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6728"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6748"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4389"
-       id="radialGradient6781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7191227,0,0,0.7191227,23.696408,18.236608)"
-       cx="84.365685"
-       cy="64.927307"
-       fx="84.365685"
-       fy="64.927307"
-       r="22.334578" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-397.88007"
-     inkscape:cy="205.69941"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1028"
-     inkscape:window-x="20"
-     inkscape:window-y="20"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2653"
-       visible="true"
-       enabled="true"
-       color="#ff00ff"
-       opacity="0.1254902"
-       empcolor="#0000f2"
-       empopacity="0.25098039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23.969062,28.50558"
-       id="guide3488" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.401268,34.125445"
-       id="guide3490" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2648">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>device</rdf:li>
-            <rdf:li>subwoofer</rdf:li>
-            <rdf:li>output</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:title>audio-subwoofer</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Evangeline McGlynn</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g6770">
-      <path
-         sodipodi:nodetypes="csccc"
-         id="path3286"
-         d="M 42.842316,39.045143 C 42.464661,41.471941 41.414441,43.219015 40.17903,43.219015 C 38.935955,43.219015 37.880378,41.450202 37.508794,38.999908 C 37.859301,37.817247 39.174918,37.23702 40.190441,37.271125 C 41.476403,37.203551 42.469629,37.948644 42.842316,39.045143 z"
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 11.018985,39.045143 C 10.641329,41.471941 9.5911095,43.219015 8.3556983,43.219015 C 7.1126243,43.219015 6.0570463,41.450202 5.6854623,38.999908 C 6.0359693,37.817247 7.3515863,37.23702 8.3671093,37.271125 C 9.6530715,37.203551 10.646297,37.948644 11.018985,39.045143 z"
-         id="path3288"
-         sodipodi:nodetypes="csccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3264"
-         d="M 11.578967,6.9788731 C 22.034478,4.1293728 25.918929,4.3517447 36.542557,6.9788731 L 43.942117,13.152471 L 4.1794077,13.152471 L 11.578967,6.9788731 z"
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1.28661346;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3266"
-         d="M 3.9145768,13.137135 C 16.486736,9.7856746 31.129598,9.8716096 44.071529,13.137135 L 44.014975,39.76734 C 30.802445,42.114593 16.912824,42.159732 3.9711319,39.902758 L 3.9145768,13.137135 z"
-         style="fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         transform="matrix(0,0.4858156,-0.4858156,0,49.057554,-14.78506)"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         sodipodi:ry="21.396112"
-         sodipodi:rx="21.396112"
-         sodipodi:cy="64.927307"
-         sodipodi:cx="84.365685"
-         id="path3238"
-         style="fill:url(#radialGradient6781);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:2.05839419;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.53625679;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3260"
-         sodipodi:cx="84.365685"
-         sodipodi:cy="64.927307"
-         sodipodi:rx="21.396112"
-         sodipodi:ry="21.396112"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         transform="matrix(0,0.2827849,-0.2827849,0,53.7183,2.3437637)" />
-      <path
-         transform="matrix(0,0.1973419,-0.1973419,0,48.148923,9.5522206)"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         sodipodi:ry="21.396112"
-         sodipodi:rx="21.396112"
-         sodipodi:cy="64.927307"
-         sodipodi:cx="84.365685"
-         id="path6518"
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:5.06734753;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 4.9461591,13.950789 C 16.44898,10.961669 29.786179,10.935259 43.040609,13.950789 L 42.984059,38.893489 C 29.63547,40.978079 17.006909,41.160879 5.0027091,39.028909 L 4.9461591,13.950789 z"
-         id="path6561"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:5.06734753;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path6581"
-         sodipodi:cx="84.365685"
-         sodipodi:cy="64.927307"
-         sodipodi:rx="21.396112"
-         sodipodi:ry="21.396112"
-         d="M 105.7618,64.927307 A 21.396112,21.396112 0 1 1 62.969572,64.927307 A 21.396112,21.396112 0 1 1 105.7618,64.927307 z"
-         transform="matrix(0,0.1973419,-0.1973419,0,30.327733,9.5522212)" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/status/Makefile.am b/mate-volume-control/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index c42c14e..0000000
--- a/mate-volume-control/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/mate
-size = scalable
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			        	\
-	audio-input-microphone-high.svg		\
-	audio-input-microphone-low.svg		\
-	audio-input-microphone-medium.svg	\
-	audio-input-microphone-muted.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-high.svg b/mate-volume-control/data/icons/scalable/status/audio-input-microphone-high.svg
deleted file mode 100644
index fa30895..0000000
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-high.svg
+++ /dev/null
@@ -1,1076 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2790"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="audio-input-mic-high.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2792">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.6828427,-122.46854,-61.286186)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6964"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6976"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient6958">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop6960" />
-      <stop
-         id="stop6966"
-         offset="0.60000002"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0;"
-         offset="1"
-         id="stop6962" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6984"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-69.461,-45.746674)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3579">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3581" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3583" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3585"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)" />
-    <linearGradient
-       id="linearGradient3228">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3230" />
-      <stop
-         id="stop3573"
-         offset="0.06770357"
-         style="stop-color:black;stop-opacity:0.42857143;" />
-      <stop
-         id="stop3569"
-         offset="0.29894069"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         style="stop-color:black;stop-opacity:0.49803922;"
-         offset="0.77437174"
-         id="stop3571" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3567"
-       gradientUnits="userSpaceOnUse"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399"
-       gradientTransform="translate(0,3)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2920">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2922" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2924" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient2926"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2877">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2879" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2881" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient2894"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3815">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2892"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2867">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2869" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2871" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient2890"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       id="linearGradient3734">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3736" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3738" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3740"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient4481">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4483" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop4485" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient4487"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2904">
-      <stop
-         id="stop2906"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0.21551724"
-         id="stop2910" />
-      <stop
-         id="stop2912"
-         offset="0.70243758"
-         style="stop-color:#c3c4c2;stop-opacity:1;" />
-      <stop
-         id="stop2908"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient2902"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2949"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2943">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop2945" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop2947" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientTransform="translate(14,0)" />
-    <linearGradient
-       id="linearGradient2981">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2983" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop2985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient2987"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientTransform="translate(20,-1)" />
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient3726">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3728" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop3730" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3732"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3703">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3705" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3707" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3709"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3779">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3781" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3783" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3785"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2965">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:0;"
-         offset="1"
-         id="stop2969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient2971"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3711"
-       inkscape:collect="always">
-      <stop
-         id="stop3713"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         id="stop3715"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3691"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4465">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="0"
-         id="stop4467" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0"
-         offset="1"
-         id="stop4469" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4465"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942"
-       gradientTransform="translate(-0.25,12.5)" />
-    <linearGradient
-       id="linearGradient4475"
-       inkscape:collect="always">
-      <stop
-         id="stop4477"
-         offset="0"
-         style="stop-color:black;stop-opacity:1" />
-      <stop
-         id="stop4479"
-         offset="1"
-         style="stop-color:black;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4475"
-       id="linearGradient4473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.25,13.5)"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient4505"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4499">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop4501" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop4503" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2798" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3371"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.6828427,-122.46854,-61.286186)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-53.287444,-45.746674)"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3026"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient3032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(14,0)"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3048"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient3050"
-       gradientUnits="userSpaceOnUse"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient3052"
-       gradientUnits="userSpaceOnUse"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient3056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient3058"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient3060"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient3062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3)"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3066"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.270833"
-     inkscape:cx="23.999999"
-     inkscape:cy="23.999999"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="780"
-     inkscape:window-height="776"
-     inkscape:window-x="161"
-     inkscape:window-y="146" />
-  <metadata
-     id="metadata2795">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g2915"
-       transform="translate(7.6010187,0.1428571)">
-      <path
-         transform="matrix(0.727673,0,0,1.235135,7.166344,-12.0556)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2917"
-         style="opacity:0.1;fill:url(#radialGradient3026);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.233813,0,0,1.235135,-4.890235,-6.055598)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2919"
-         style="opacity:0.7;fill:url(#radialGradient3028);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2925"
-         style="opacity:1;fill:url(#radialGradient3030);fill-opacity:1;stroke:#555753;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.43667,0,0,0.429141,14.09824,21.41158)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2927"
-         style="opacity:1;fill:url(#radialGradient3032);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccssccc"
-         id="path2929"
-         d="M 27.35249,32.125 C 25.613836,32.860383 24.806671,34.177948 23.67433,35.292277 C 23.188021,35.599877 23.07463,36.001723 23.15468,36.568962 C 23.23473,37.136205 23.644126,37.624296 24.196826,37.787146 C 24.749524,37.949994 25.196373,37.917185 25.574713,37.485007 C 26.676195,35.285524 28.744563,33.983863 31,32.85591 C 29.870496,32.536987 28.651039,32.264053 27.35249,32.125 z"
-         style="opacity:0.7;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 23.8125,31.5 C 20.473005,31.5 17.440949,32.183256 15.34375,33.25 C 13.246551,34.316744 12.21875,35.666366 12.21875,36.90625 C 12.21875,38.146134 13.246551,39.495756 15.34375,40.5625 C 17.440949,41.629244 20.473005,42.312501 23.8125,42.3125 C 27.151995,42.3125 30.184051,41.629244 32.28125,40.5625 C 34.378449,39.495756 35.40625,38.146134 35.40625,36.90625 C 35.40625,35.666366 34.378449,34.316744 32.28125,33.25 C 30.184051,32.183256 27.151995,31.5 23.8125,31.5 z"
-         id="path2931"
-         style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient3036);stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         inkscape:original="M 23.8125 30.5 C 16.859872 30.5 11.21875 33.368948 11.21875 36.90625 C 11.21875 40.443552 16.859872 43.312502 23.8125 43.3125 C 30.765128 43.3125 36.406249 40.443552 36.40625 36.90625 C 36.40625 33.368948 30.765128 30.5 23.8125 30.5 z "
-         inkscape:radius="-0.99470079"
-         sodipodi:type="inkscape:offset" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2933"
-         d="M 24.5,27.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3038);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2935"
-         d="M 34.500008,18.999997 C 34.5,23.285708 30.040008,26.499998 24.500006,26.499998 C 18.960004,26.499998 14.5,23.285708 14.500003,18.999997"
-         style="fill:none;fill-opacity:1;stroke:#888a85;stroke-width:3.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="12.5"
-         height="2.9999995"
-         width="4"
-         id="rect2937"
-         style="opacity:1;fill:url(#linearGradient3040);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="32.5"
-         height="2.9999995"
-         width="4"
-         id="rect2939"
-         style="opacity:1;fill:url(#linearGradient3042);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2941"
-         d="M 34.500008,18.999991 C 34.500008,23.285701 30.040008,26.499992 24.500006,26.499992 C 18.960004,26.499992 14.5,23.285701 14.500003,18.999991"
-         style="fill:none;fill-opacity:1;stroke:url(#linearGradient3044);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="30"
-         height="6"
-         width="3.0000005"
-         id="rect2943"
-         style="opacity:1;fill:url(#linearGradient3046);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,12.25,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2945"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="16"
-         height="6"
-         width="3.0000005"
-         id="rect2947"
-         style="opacity:1;fill:url(#linearGradient3048);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="7.0108709"
-         rx="7.0000019"
-         y="1.5000002"
-         x="17.499996"
-         height="24.000008"
-         width="14.000004"
-         id="rect2949"
-         style="opacity:1;fill:url(#linearGradient3050);fill-opacity:1;stroke:url(#linearGradient3052);stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2951"
-         d="M 24.5,26.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3054);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,-7.75,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2953"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <g
-         id="g2955"
-         style="display:inline">
-        <rect
-           style="opacity:1;fill:url(#linearGradient3056);fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="rect2957"
-           width="4"
-           height="15.374996"
-           x="20"
-           y="6"
-           rx="2"
-           ry="2.1991496" />
-        <path
-           sodipodi:type="inkscape:offset"
-           inkscape:radius="-0.54470092"
-           inkscape:original="M 24.5 2.5 C 20.621999 2.5 17.5 5.615977 17.5 9.5 L 17.5 19.5 C 17.5 23.384022 20.621999 26.5 24.5 26.5 C 28.378001 26.5 31.5 23.384022 31.5 19.5 L 31.5 9.5 C 31.5 5.6159775 28.378001 2.5 24.5 2.5 z "
-           style="opacity:0.2;fill:url(#linearGradient3058);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="path2959"
-           d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,19.5 C 18.03125,23.092133 20.913778,25.96875 24.5,25.96875 C 28.086222,25.96875 30.96875,23.092133 30.96875,19.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-           transform="translate(0,-1)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:url(#linearGradient3060);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path2961"
-           sodipodi:cx="23.65625"
-           sodipodi:cy="7.6875"
-           sodipodi:rx="3.34375"
-           sodipodi:ry="3.0625"
-           d="M 27,7.6875 A 3.34375,3.0625 0 1 1 20.3125,7.6875 A 3.34375,3.0625 0 1 1 27,7.6875 z"
-           transform="matrix(1,0,0,1.081633,-0.375,-1.252551)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path2963"
-         d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,14.5 L 30.96875,14.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-         style="opacity:0.9;fill:url(#radialGradient3062);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         transform="translate(0,-1)" />
-      <path
-         sodipodi:nodetypes="csssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssc"
-         id="path2965"
-         d="M 22.5,3 C 22.224,3 22,3.224 22,3.5 C 22,3.776 22.224,4 22.5,4 C 22.776,4 23,3.776 23,3.5 C 23,3.224 22.776,3 22.5,3 z M 24.5,3 C 24.224,3 24,3.224 24,3.5 C 24,3.776 24.224,4 24.5,4 C 24.776,4 25,3.776 25,3.5 C 25,3.224 24.776,3 24.5,3 z M 26.5,3 C 26.224,3 26,3.224 26,3.5 C 26,3.776 26.224,4 26.5,4 C 26.776,4 27,3.776 27,3.5 C 27,3.224 26.776,3 26.5,3 z M 21.5,4 C 21.224,4 21,4.224 21,4.5 C 21,4.776 21.224,5 21.5,5 C 21.776,5 22,4.776 22,4.5 C 22,4.224 21.776,4 21.5,4 z M 23.5,4 C 23.224,4 22.999999,4.2240007 23,4.5 C 23,4.7759993 23.223999,5 23.5,5 C 23.776,5 24,4.7759993 24,4.5 C 24,4.2240007 23.776,4 23.5,4 z M 25.5,4 C 25.224,4 24.999999,4.2240007 25,4.5 C 25,4.7759993 25.223999,5 25.5,5 C 25.776,5 26,4.7759993 26,4.5 C 26,4.2240007 25.776,4 25.5,4 z M 27.5,4 C 27.224,4 27,4.224 27,4.5 C 27,4.776 27.224,5 27.5,5 C 27.776,5 28,4.776 28,4.5 C 28,4.224 27.776,4 27.5,4 z M 20.5,5 C 20.224,5 19.999999,5.2240008 20,5.5 C 20,5.7759993 20.223999,6 20.5,6 C 20.776,6 21,5.7759994 21,5.5 C 21,5.2240007 20.776,5 20.5,5 z M 22.5,5 C 22.224,5 21.999999,5.2240008 22,5.5 C 22,5.7759993 22.223999,6 22.5,6 C 22.776,6 23,5.7759994 23,5.5 C 23,5.2240007 22.776,5 22.5,5 z M 24.5,5 C 24.224,5 23.999999,5.2240008 24,5.5 C 24,5.7759993 24.223999,6 24.5,6 C 24.776,6 25,5.7759994 25,5.5 C 25,5.2240007 24.776,5 24.5,5 z M 26.5,5 C 26.224,5 25.999999,5.2240008 26,5.5 C 26,5.7759993 26.223999,6 26.5,6 C 26.776,6 27,5.7759994 27,5.5 C 27,5.2240007 26.776,5 26.5,5 z M 28.5,5 C 28.224,5 28,5.224 28,5.5 C 28,5.776 28.224,6 28.5,6 C 28.776,6 29,5.776 29,5.5 C 29,5.224 28.776,5 28.5,5 z M 19.5,6 C 19.224,6 18.999999,6.2240008 19,6.5 C 19,6.7759993 19.223999,7 19.5,7 C 19.776,7 20,6.7759994 20,6.5 C 20,6.2240007 19.776,6 19.5,6 z M 21.5,6 C 21.224,6 20.999999,6.2240008 21,6.5 C 21,6.7759993 21.223999,7 21.5,7 C 21.776,7 22,6.7759994 22,6.5 C 22,6.2240007 21.776,6 21.5,6 z M 23.5,6 C 23.224,6 22.999999,6.2240008 23,6.5 C 23,6.7759993 23.223999,7 23.5,7 C 23.776,7 24,6.7759994 24,6.5 C 24,6.2240007 23.776,6 23.5,6 z M 25.5,6 C 25.224,6 24.999999,6.2240008 25,6.5 C 25,6.7759993 25.223999,7 25.5,7 C 25.776,7 26,6.7759994 26,6.5 C 26,6.2240007 25.776,6 25.5,6 z M 27.5,6 C 27.224,6 26.999999,6.2240008 27,6.5 C 27,6.7759993 27.223999,7 27.5,7 C 27.776,7 28,6.7759994 28,6.5 C 28,6.2240007 27.776,6 27.5,6 z M 29.5,6 C 29.224,6 29,6.224 29,6.5 C 29,6.776 29.224,7 29.5,7 C 29.776,7 30,6.776 30,6.5 C 30,6.224 29.776,6 29.5,6 z M 20.5,7 C 20.224,7 19.999999,7.2240008 20,7.5 C 20,7.7759993 20.223999,8.0000002 20.5,8 C 20.776,8 21,7.7759994 21,7.5 C 21,7.2240007 20.776,7 20.5,7 z M 22.5,7 C 22.224,7 21.999999,7.2240008 22,7.5 C 22,7.7759993 22.223999,8.0000002 22.5,8 C 22.776,8 23,7.7759994 23,7.5 C 23,7.2240007 22.776,7 22.5,7 z M 24.5,7 C 24.224,7 23.999999,7.2240008 24,7.5 C 24,7.7759993 24.223999,8.0000002 24.5,8 C 24.776,8 25,7.7759994 25,7.5 C 25,7.2240007 24.776,7 24.5,7 z M 26.5,7 C 26.224,7 25.999999,7.2240008 26,7.5 C 26,7.7759993 26.223999,8.0000002 26.5,8 C 26.776,8 27,7.7759994 27,7.5 C 27,7.2240007 26.776,7 26.5,7 z M 28.5,7 C 28.224,7 27.999999,7.2240008 28,7.5 C 28,7.7759993 28.223999,8.0000002 28.5,8 C 28.776,8 29,7.7759994 29,7.5 C 29,7.2240007 28.776,7 28.5,7 z M 30.5,7 C 30.224,7 30,7.224 30,7.5 C 30,7.776 30.224,8 30.5,8 C 30.776,8 31,7.776 31,7.5 C 31,7.224 30.776,7 30.5,7 z M 19.5,8 C 19.224,8 18.999999,8.2240008 19,8.5 C 19,8.7759993 19.223999,9 19.5,9 C 19.776,9 20,8.7759994 20,8.5 C 20,8.2240007 19.776,8 19.5,8 z M 21.5,8 C 21.224,8 20.999999,8.2240008 21,8.5 C 21,8.7759993 21.223999,9 21.5,9 C 21.776,9 22,8.7759994 22,8.5 C 22,8.2240007 21.776,8 21.5,8 z M 23.5,8 C 23.224,8 22.999999,8.2240008 23,8.5 C 23,8.7759993 23.223999,9 23.5,9 C 23.776,9 24,8.7759994 24,8.5 C 24,8.2240007 23.776,8 23.5,8 z M 25.5,8 C 25.224,8 24.999999,8.2240008 25,8.5 C 25,8.7759993 25.223999,9 25.5,9 C 25.776,9 26,8.7759994 26,8.5 C 26,8.2240007 25.776,8 25.5,8 z M 27.5,8 C 27.224,8 26.999999,8.2240008 27,8.5 C 27,8.7759993 27.223999,9 27.5,9 C 27.776,9 28,8.7759994 28,8.5 C 28,8.2240007 27.776,8 27.5,8 z M 29.5,8 C 29.224,8 28.999999,8.2240008 29,8.5 C 29,8.7759993 29.223999,9 29.5,9 C 29.776,9 30,8.7759994 30,8.5 C 30,8.2240007 29.776,8 29.5,8 z M 18.5,9 C 18.224,9 17.999999,9.224001 18,9.5 C 18,9.775999 18.223999,10 18.5,10 C 18.776,10 19,9.775999 19,9.5 C 19,9.224001 18.776,9 18.5,9 z M 20.5,9 C 20.224,9 19.999999,9.224001 20,9.5 C 20,9.775999 20.223999,10 20.5,10 C 20.776,10 21,9.775999 21,9.5 C 21,9.224001 20.776,9 20.5,9 z M 22.5,9 C 22.224,9 21.999999,9.224001 22,9.5 C 22,9.775999 22.223999,10 22.5,10 C 22.776,10 23,9.775999 23,9.5 C 23,9.224001 22.776,9 22.5,9 z M 24.5,9 C 24.224,9 23.999999,9.224001 24,9.5 C 24,9.775999 24.223999,10 24.5,10 C 24.776,10 25,9.775999 25,9.5 C 25,9.224001 24.776,9 24.5,9 z M 26.5,9 C 26.224,9 25.999999,9.224001 26,9.5 C 26,9.775999 26.223999,10 26.5,10 C 26.776,10 27,9.775999 27,9.5 C 27,9.224001 26.776,9 26.5,9 z M 28.5,9 C 28.224,9 27.999999,9.224001 28,9.5 C 28,9.775999 28.223999,10 28.5,10 C 28.776,10 29,9.775999 29,9.5 C 29,9.224001 28.776,9 28.5,9 z M 30.5,9 C 30.224,9 30,9.224 30,9.5 C 30,9.776 30.224,10 30.5,10 C 30.776,10 31,9.776 31,9.5 C 31,9.224 30.776,9 30.5,9 z M 19.5,10 C 19.224,10 18.999999,10.224001 19,10.5 C 19,10.775999 19.223999,11 19.5,11 C 19.776,11 20,10.775999 20,10.5 C 20,10.224001 19.776,10 19.5,10 z M 21.5,10 C 21.224,10 20.999999,10.224001 21,10.5 C 21,10.775999 21.223999,11 21.5,11 C 21.776,11 22,10.775999 22,10.5 C 22,10.224001 21.776,10 21.5,10 z M 23.5,10 C 23.224,10 22.999999,10.224001 23,10.5 C 23,10.775999 23.223999,11 23.5,11 C 23.776,11 24,10.775999 24,10.5 C 24,10.224001 23.776,10 23.5,10 z M 25.5,10 C 25.224,10 24.999999,10.224001 25,10.5 C 25,10.775999 25.223999,11 25.5,11 C 25.776,11 26,10.775999 26,10.5 C 26,10.224001 25.776,10 25.5,10 z M 27.5,10 C 27.224,10 26.999999,10.224001 27,10.5 C 27,10.775999 27.223999,11 27.5,11 C 27.776,11 28,10.775999 28,10.5 C 28,10.224001 27.776,10 27.5,10 z M 29.5,10 C 29.224,10 28.999999,10.224001 29,10.5 C 29,10.775999 29.223999,11 29.5,11 C 29.776,11 30,10.775999 30,10.5 C 30,10.224001 29.776,10 29.5,10 z M 18.5,11 C 18.224,11 17.999999,11.224 18,11.5 C 18,11.775999 18.223999,12 18.5,12 C 18.776,12 19,11.775999 19,11.5 C 19,11.224001 18.776,11 18.5,11 z M 20.5,11 C 20.224,11 19.999999,11.224 20,11.5 C 20,11.775999 20.223999,12 20.5,12 C 20.776,12 21,11.775999 21,11.5 C 21,11.224001 20.776,11 20.5,11 z M 22.5,11 C 22.224,11 21.999999,11.224 22,11.5 C 22,11.775999 22.223999,12 22.5,12 C 22.776,12 23,11.775999 23,11.5 C 23,11.224001 22.776,11 22.5,11 z M 24.5,11 C 24.224,11 23.999999,11.224 24,11.5 C 24,11.775999 24.223999,12 24.5,12 C 24.776,12 25,11.775999 25,11.5 C 25,11.224001 24.776,11 24.5,11 z M 26.5,11 C 26.224,11 25.999999,11.224 26,11.5 C 26,11.775999 26.223999,12 26.5,12 C 26.776,12 27,11.775999 27,11.5 C 27,11.224001 26.776,11 26.5,11 z M 28.5,11 C 28.224,11 27.999999,11.224 28,11.5 C 28,11.775999 28.223999,12 28.5,12 C 28.776,12 29,11.775999 29,11.5 C 29,11.224001 28.776,11 28.5,11 z M 30.5,11 C 30.224,11 30,11.224 30,11.5 C 30,11.776 30.224,12 30.5,12 C 30.776,12 31,11.776 31,11.5 C 31,11.224 30.776,11 30.5,11 z M 19.5,12 C 19.224,12 18.999999,12.224 19,12.5 C 19,12.775999 19.223999,13 19.5,13 C 19.776,13 20,12.775999 20,12.5 C 20,12.224001 19.776,12 19.5,12 z M 21.5,12 C 21.224,12 20.999999,12.224 21,12.5 C 21,12.775999 21.223999,13 21.5,13 C 21.776,13 22,12.775999 22,12.5 C 22,12.224001 21.776,12 21.5,12 z M 23.5,12 C 23.224,12 22.999999,12.224 23,12.5 C 23,12.775999 23.223999,13 23.5,13 C 23.776,13 24,12.775999 24,12.5 C 24,12.224001 23.776,12 23.5,12 z M 25.5,12 C 25.224,12 24.999999,12.224 25,12.5 C 25,12.775999 25.223999,13 25.5,13 C 25.776,13 26,12.775999 26,12.5 C 26,12.224001 25.776,12 25.5,12 z M 27.5,12 C 27.224,12 26.999999,12.224 27,12.5 C 27,12.775999 27.223999,13 27.5,13 C 27.776,13 28,12.775999 28,12.5 C 28,12.224001 27.776,12 27.5,12 z M 29.5,12 C 29.224,12 28.999999,12.224 29,12.5 C 29,12.775999 29.223999,13 29.5,13 C 29.776,13 30,12.775999 30,12.5 C 30,12.224001 29.776,12 29.5,12 z M 18.5,13 C 18.224,13 17.999999,13.224 18,13.5 C 18,13.775999 18.223999,14 18.5,14 C 18.776,14 19,13.775999 19,13.5 C 19,13.224001 18.776,13 18.5,13 z M 20.5,13 C 20.224,13 19.999999,13.224 20,13.5 C 20,13.775999 20.223999,14 20.5,14 C 20.776,14 21,13.775999 21,13.5 C 21,13.224001 20.776,13 20.5,13 z M 22.5,13 C 22.224,13 21.999999,13.224 22,13.5 C 22,13.775999 22.223999,14 22.5,14 C 22.776,14 23,13.775999 23,13.5 C 23,13.224001 22.776,13 22.5,13 z M 24.5,13 C 24.224,13 23.999999,13.224 24,13.5 C 24,13.775999 24.223999,14 24.5,14 C 24.776,14 25,13.775999 25,13.5 C 25,13.224001 24.776,13 24.5,13 z M 26.5,13 C 26.224,13 25.999999,13.224 26,13.5 C 26,13.775999 26.223999,14 26.5,14 C 26.776,14 27,13.775999 27,13.5 C 27,13.224001 26.776,13 26.5,13 z M 28.5,13 C 28.224,13 27.999999,13.224 28,13.5 C 28,13.775999 28.223999,14 28.5,14 C 28.776,14 29,13.775999 29,13.5 C 29,13.224001 28.776,13 28.5,13 z M 30.5,13 C 30.224,13 30,13.224 30,13.5 C 30,13.776 30.224,14 30.5,14 C 30.776,14 31,13.776 31,13.5 C 31,13.224 30.776,13 30.5,13 z M 19.5,14 C 19.224,14 18.999999,14.224 19,14.5 C 19,14.775999 19.223999,15 19.5,15 C 19.776,15 20,14.775999 20,14.5 C 20,14.224001 19.776,14 19.5,14 z M 21.5,14 C 21.224,14 20.999999,14.224 21,14.5 C 21,14.775999 21.223999,15 21.5,15 C 21.776,15 22,14.775999 22,14.5 C 22,14.224001 21.776,14 21.5,14 z M 23.5,14 C 23.224,14 22.999999,14.224 23,14.5 C 23,14.775999 23.223999,15 23.5,15 C 23.776,15 24,14.775999 24,14.5 C 24,14.224001 23.776,14 23.5,14 z M 25.5,14 C 25.224,14 24.999999,14.224 25,14.5 C 25,14.775999 25.223999,15 25.5,15 C 25.776,15 26,14.775999 26,14.5 C 26,14.224001 25.776,14 25.5,14 z M 27.5,14 C 27.224,14 26.999999,14.224 27,14.5 C 27,14.775999 27.223999,15 27.5,15 C 27.776,15 28,14.775999 28,14.5 C 28,14.224001 27.776,14 27.5,14 z M 29.5,14 C 29.224,14 28.999999,14.224 29,14.5 C 29,14.775999 29.223999,15 29.5,15 C 29.776,15 30,14.775999 30,14.5 C 30,14.224001 29.776,14 29.5,14 z M 18.5,15 C 18.224,15 17.999999,15.224 18,15.5 C 18,15.775999 18.223999,16 18.5,16 C 18.776,16 19,15.775999 19,15.5 C 19,15.224001 18.776,15 18.5,15 z M 20.5,15 C 20.224,15 19.999999,15.224 20,15.5 C 20,15.775999 20.223999,16 20.5,16 C 20.776,16 21,15.775999 21,15.5 C 21,15.224001 20.776,15 20.5,15 z M 22.5,15 C 22.224,15 21.999999,15.224 22,15.5 C 22,15.775999 22.223999,16 22.5,16 C 22.776,16 23,15.775999 23,15.5 C 23,15.224001 22.776,15 22.5,15 z M 24.5,15 C 24.224,15 23.999999,15.224 24,15.5 C 24,15.775999 24.223999,16 24.5,16 C 24.776,16 25,15.775999 25,15.5 C 25,15.224001 24.776,15 24.5,15 z M 26.5,15 C 26.224,15 25.999999,15.224 26,15.5 C 26,15.775999 26.223999,16 26.5,16 C 26.776,16 27,15.775999 27,15.5 C 27,15.224001 26.776,15 26.5,15 z M 28.5,15 C 28.224,15 27.999999,15.224 28,15.5 C 28,15.775999 28.223999,16 28.5,16 C 28.776,16 29,15.775999 29,15.5 C 29,15.224001 28.776,15 28.5,15 z M 30.5,15 C 30.224,15 30,15.224 30,15.5 C 30,15.776 30.224,16 30.5,16 C 30.776,16 31,15.776 31,15.5 C 31,15.224 30.776,15 30.5,15 z M 19.5,16 C 19.224,16 18.999999,16.224001 19,16.5 C 19,16.775999 19.223999,17 19.5,17 C 19.776,17 20,16.776 20,16.5 C 20,16.224001 19.776,16 19.5,16 z M 21.5,16 C 21.224,16 20.999999,16.224001 21,16.5 C 21,16.775999 21.223999,17 21.5,17 C 21.776,17 22,16.776 22,16.5 C 22,16.224001 21.776,16 21.5,16 z M 23.5,16 C 23.224,16 22.999999,16.224001 23,16.5 C 23,16.775999 23.223999,17 23.5,17 C 23.776,17 24,16.776 24,16.5 C 24,16.224001 23.776,16 23.5,16 z M 25.5,16 C 25.224,16 24.999999,16.224001 25,16.5 C 25,16.775999 25.223999,17 25.5,17 C 25.776,17 26,16.776 26,16.5 C 26,16.224001 25.776,16 25.5,16 z M 27.5,16 C 27.224,16 26.999999,16.224001 27,16.5 C 27,16.775999 27.223999,17 27.5,17 C 27.776,17 28,16.776 28,16.5 C 28,16.224001 27.776,16 27.5,16 z M 29.5,16 C 29.224,16 28.999999,16.224 29,16.5 C 29,16.775999 29.223999,17 29.5,17 C 29.776,17 30,16.775999 30,16.5 C 30,16.224001 29.776,16 29.5,16 z M 18.5,17 C 18.224,17 17.999999,17.224001 18,17.5 C 18,17.775999 18.223999,18 18.5,18 C 18.776,18 19,17.776 19,17.5 C 19,17.224001 18.776,17 18.5,17 z M 20.5,17 C 20.224,17 19.999999,17.224001 20,17.5 C 20,17.775999 20.223999,18 20.5,18 C 20.776,18 21,17.776 21,17.5 C 21,17.224001 20.776,17 20.5,17 z M 22.5,17 C 22.224,17 21.999999,17.224001 22,17.5 C 22,17.775999 22.223999,18 22.5,18 C 22.776,18 23,17.776 23,17.5 C 23,17.224001 22.776,17 22.5,17 z M 24.5,17 C 24.224,17 23.999999,17.224001 24,17.5 C 24,17.775999 24.223999,18 24.5,18 C 24.776,18 25,17.776 25,17.5 C 25,17.224001 24.776,17 24.5,17 z M 26.5,17 C 26.224,17 25.999999,17.224001 26,17.5 C 26,17.775999 26.223999,18 26.5,18 C 26.776,18 27,17.776 27,17.5 C 27,17.224001 26.776,17 26.5,17 z M 28.5,17 C 28.224,17 27.999999,17.224001 28,17.5 C 28,17.775999 28.223999,18 28.5,18 C 28.776,18 29,17.776 29,17.5 C 29,17.224001 28.776,17 28.5,17 z M 30.5,17 C 30.224,17 30,17.224 30,17.5 C 30,17.776 30.224,18 30.5,18 C 30.776,18 31,17.776 31,17.5 C 31,17.224 30.776,17 30.5,17 z M 19.5,18 C 19.224,18 18.999999,18.224001 19,18.5 C 19,18.775999 19.223999,19 19.5,19 C 19.776,19 20,18.776 20,18.5 C 20,18.224001 19.776,18 19.5,18 z M 21.5,18 C 21.224,18 20.999999,18.224001 21,18.5 C 21,18.775999 21.223999,19 21.5,19 C 21.776,19 22,18.776 22,18.5 C 22,18.224001 21.776,18 21.5,18 z M 23.5,18 C 23.224,18 22.999999,18.224001 23,18.5 C 23,18.775999 23.223999,19 23.5,19 C 23.776,19 24,18.776 24,18.5 C 24,18.224001 23.776,18 23.5,18 z M 25.5,18 C 25.224,18 24.999999,18.224001 25,18.5 C 25,18.775999 25.223999,19 25.5,19 C 25.776,19 26,18.776 26,18.5 C 26,18.224001 25.776,18 25.5,18 z M 27.5,18 C 27.224,18 26.999999,18.224001 27,18.5 C 27,18.775999 27.223999,19 27.5,19 C 27.776,19 28,18.776 28,18.5 C 28,18.224001 27.776,18 27.5,18 z M 29.5,18 C 29.224,18 28.999999,18.224001 29,18.5 C 29,18.775999 29.223999,19 29.5,19 C 29.776,19 30,18.776 30,18.5 C 30,18.224001 29.776,18 29.5,18 z M 18.5,19 C 18.224,19 17.999999,19.224001 18,19.5 C 18,19.775999 18.223999,19.999999 18.5,20 C 18.776,20 19,19.776 19,19.5 C 19,19.224001 18.776,19 18.5,19 z M 20.5,19 C 20.224,19 19.999999,19.224001 20,19.5 C 20,19.775999 20.223999,19.999999 20.5,20 C 20.776,20 21,19.776 21,19.5 C 21,19.224001 20.776,19 20.5,19 z M 22.5,19 C 22.224,19 21.999999,19.224001 22,19.5 C 22,19.775999 22.223999,19.999999 22.5,20 C 22.776,20 23,19.776 23,19.5 C 23,19.224001 22.776,19 22.5,19 z M 24.5,19 C 24.224,19 23.999999,19.224001 24,19.5 C 24,19.775999 24.223999,19.999999 24.5,20 C 24.776,20 25,19.776 25,19.5 C 25,19.224001 24.776,19 24.5,19 z M 26.5,19 C 26.224,19 25.999999,19.224001 26,19.5 C 26,19.775999 26.223999,19.999999 26.5,20 C 26.776,20 27,19.776 27,19.5 C 27,19.224001 26.776,19 26.5,19 z M 28.5,19 C 28.224,19 27.999999,19.224001 28,19.5 C 28,19.775999 28.223999,19.999999 28.5,20 C 28.776,20 29,19.776 29,19.5 C 29,19.224001 28.776,19 28.5,19 z M 30.5,19 C 30.224,19 30,19.224 30,19.5 C 30,19.776 30.224,20 30.5,20 C 30.776,20 31,19.776 31,19.5 C 31,19.224 30.776,19 30.5,19 z M 19.5,20 C 19.224,20 18.999999,20.224001 19,20.5 C 19,20.775999 19.223999,20.999999 19.5,21 C 19.776,21 20,20.776 20,20.5 C 20,20.224001 19.776,20 19.5,20 z M 21.5,20 C 21.224,20 20.999999,20.224001 21,20.5 C 21,20.775999 21.223999,20.999999 21.5,21 C 21.776,21 22,20.776 22,20.5 C 22,20.224001 21.776,20 21.5,20 z M 23.5,20 C 23.224,20 22.999999,20.224001 23,20.5 C 23,20.775999 23.223999,20.999999 23.5,21 C 23.776,21 24,20.776 24,20.5 C 24,20.224001 23.776,20 23.5,20 z M 25.5,20 C 25.224,20 24.999999,20.224001 25,20.5 C 25,20.775999 25.223999,20.999999 25.5,21 C 25.776,21 26,20.776 26,20.5 C 26,20.224001 25.776,20 25.5,20 z M 27.5,20 C 27.224,20 26.999999,20.224001 27,20.5 C 27,20.775999 27.223999,20.999999 27.5,21 C 27.776,21 28,20.776 28,20.5 C 28,20.224001 27.776,20 27.5,20 z M 29.5,20 C 29.224,20 28.999999,20.224001 29,20.5 C 29,20.775999 29.223999,20.999999 29.5,21 C 29.776,21 30,20.776 30,20.5 C 30,20.224001 29.776,20 29.5,20 z M 20.5,21 C 20.224,21 19.999999,21.224001 20,21.5 C 20,21.775999 20.223999,21.999999 20.5,22 C 20.776,22 21,21.776 21,21.5 C 21,21.224001 20.776,21 20.5,21 z M 22.5,21 C 22.224,21 21.999999,21.224001 22,21.5 C 22,21.775999 22.223999,21.999999 22.5,22 C 22.776,22 23,21.776 23,21.5 C 23,21.224001 22.776,21 22.5,21 z M 24.5,21 C 24.224,21 23.999999,21.224001 24,21.5 C 24,21.775999 24.223999,21.999999 24.5,22 C 24.776,22 25,21.776 25,21.5 C 25,21.224001 24.776,21 24.5,21 z M 26.5,21 C 26.224,21 25.999999,21.224001 26,21.5 C 26,21.775999 26.223999,21.999999 26.5,22 C 26.776,22 27,21.776 27,21.5 C 27,21.224001 26.776,21 26.5,21 z M 28.5,21 C 28.224,21 27.999999,21.224001 28,21.5 C 28,21.775999 28.223999,21.999999 28.5,22 C 28.776,22 29,21.776 29,21.5 C 29,21.224001 28.776,21 28.5,21 z M 21.5,22 C 21.224,22 20.999999,22.224001 21,22.5 C 21,22.775999 21.223999,22.999999 21.5,23 C 21.776,23 22,22.776 22,22.5 C 22,22.224001 21.776,22 21.5,22 z M 23.5,22 C 23.224,22 22.999999,22.224001 23,22.5 C 23,22.775999 23.223999,22.999999 23.5,23 C 23.776,23 24,22.776 24,22.5 C 24,22.224001 23.776,22 23.5,22 z M 25.5,22 C 25.224,22 24.999999,22.224001 25,22.5 C 25,22.775999 25.223999,22.999999 25.5,23 C 25.776,23 26,22.776 26,22.5 C 26,22.224001 25.776,22 25.5,22 z M 27.5,22 C 27.224,22 26.999999,22.224001 27,22.5 C 27,22.775999 27.223999,22.999999 27.5,23 C 27.776,23 28,22.776 28,22.5 C 28,22.224001 27.776,22 27.5,22 z M 22.5,23 C 22.224,23 21.999999,23.224001 22,23.5 C 22,23.775999 22.223999,23.999999 22.5,24 C 22.776,24 23,23.776 23,23.5 C 23,23.224001 22.776,23 22.5,23 z M 24.5,23 C 24.224,23 23.999999,23.224001 24,23.5 C 24,23.775999 24.223999,23.999999 24.5,24 C 24.776,24 25,23.776 25,23.5 C 25,23.224001 24.776,23 24.5,23 z M 26.5,23 C 26.224,23 25.999999,23.224001 26,23.5 C 26,23.775999 26.223999,23.999999 26.5,24 C 26.776,24 27,23.776 27,23.5 C 27,23.224001 26.776,23 26.5,23 z M 23.5,24 C 23.224,24 22.999999,24.224001 23,24.5 C 23,24.775999 23.223999,24.999999 23.5,25 C 23.776,25 24,24.776 24,24.5 C 24,24.224001 23.776,24 23.5,24 z M 25.5,24 C 25.224,24 24.999999,24.224001 25,24.5 C 25,24.775999 25.223999,24.999999 25.5,25 C 25.776,25 26,24.776 26,24.5 C 26,24.224001 25.776,24 25.5,24 z"
-         style="opacity:0.5;fill:url(#linearGradient3064);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="6.0500031"
-         rx="6.0000024"
-         y="2.5000026"
-         x="18.500008"
-         height="22.000008"
-         width="12.000005"
-         id="rect2967"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3066);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:url(#radialGradient3373);display:inline"
-       id="g26136"
-       transform="matrix(0.4579202,0,0,0.9423324,-20.358831,-4.6737794)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path25249"
-         d="M 69.03125,40.1875 C 74.190803,36.02097 77.499999,29.643289 77.5,22.5 C 77.5,15.734684 74.540259,9.6637676 69.84375,5.5"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3371);stroke-width:1.17171037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:#729fcf;display:inline"
-       id="g27916"
-       transform="matrix(0.3975228,0,0,0.9423324,-18.689059,-4.6737794)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path21632"
-         d="M 67.5625,34.78125 C 71.176369,31.899733 73.499999,27.47788 73.5,22.5 C 73.5,17.793936 71.43603,13.569699 68.15625,10.6875"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3375);stroke-width:1.25757563;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:#729fcf;display:inline"
-       id="g28807"
-       transform="matrix(0.272091,0,0,0.9423324,-15.475768,-4.3498543)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path27920"
-         d="M 74.954806,30.15625 C 77.22438,28.375887 78.673556,25.606103 78.673556,22.5 C 78.673556,19.560794 77.36198,16.939552 75.298556,15.15625"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3377);stroke-width:1.52005064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-low.svg b/mate-volume-control/data/icons/scalable/status/audio-input-microphone-low.svg
deleted file mode 100644
index 2aec722..0000000
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-low.svg
+++ /dev/null
@@ -1,1045 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2790"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="audio-input-mic-low.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2792">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.6828427,-122.46854,-61.286186)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6964"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6976"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient6958">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop6960" />
-      <stop
-         id="stop6966"
-         offset="0.60000002"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0;"
-         offset="1"
-         id="stop6962" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6984"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-69.461,-45.746674)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3579">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3581" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3583" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3585"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)" />
-    <linearGradient
-       id="linearGradient3228">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3230" />
-      <stop
-         id="stop3573"
-         offset="0.06770357"
-         style="stop-color:black;stop-opacity:0.42857143;" />
-      <stop
-         id="stop3569"
-         offset="0.29894069"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         style="stop-color:black;stop-opacity:0.49803922;"
-         offset="0.77437174"
-         id="stop3571" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3567"
-       gradientUnits="userSpaceOnUse"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399"
-       gradientTransform="translate(0,3)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2920">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2922" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2924" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient2926"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2877">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2879" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2881" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient2894"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3815">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2892"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2867">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2869" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2871" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient2890"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       id="linearGradient3734">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3736" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3738" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3740"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient4481">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4483" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop4485" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient4487"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2904">
-      <stop
-         id="stop2906"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0.21551724"
-         id="stop2910" />
-      <stop
-         id="stop2912"
-         offset="0.70243758"
-         style="stop-color:#c3c4c2;stop-opacity:1;" />
-      <stop
-         id="stop2908"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient2902"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2949"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2943">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop2945" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop2947" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientTransform="translate(14,0)" />
-    <linearGradient
-       id="linearGradient2981">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2983" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop2985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient2987"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientTransform="translate(20,-1)" />
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient3726">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3728" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop3730" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3732"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3703">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3705" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3707" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3709"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3779">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3781" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3783" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3785"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2965">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:0;"
-         offset="1"
-         id="stop2969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient2971"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3711"
-       inkscape:collect="always">
-      <stop
-         id="stop3713"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         id="stop3715"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3691"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4465">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="0"
-         id="stop4467" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0"
-         offset="1"
-         id="stop4469" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4465"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942"
-       gradientTransform="translate(-0.25,12.5)" />
-    <linearGradient
-       id="linearGradient4475"
-       inkscape:collect="always">
-      <stop
-         id="stop4477"
-         offset="0"
-         style="stop-color:black;stop-opacity:1" />
-      <stop
-         id="stop4479"
-         offset="1"
-         style="stop-color:black;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4475"
-       id="linearGradient4473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.25,13.5)"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient4505"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4499">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop4501" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop4503" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2798" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-53.287444,-45.746674)"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3026"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient3032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(14,0)"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3048"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient3050"
-       gradientUnits="userSpaceOnUse"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient3052"
-       gradientUnits="userSpaceOnUse"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient3056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient3058"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient3060"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient3062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3)"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3066"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.270833"
-     inkscape:cx="23.999998"
-     inkscape:cy="23.999998"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="780"
-     inkscape:window-height="776"
-     inkscape:window-x="161"
-     inkscape:window-y="146" />
-  <metadata
-     id="metadata2795">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g2915"
-       transform="translate(7.6010187,0.1428571)">
-      <path
-         transform="matrix(0.727673,0,0,1.235135,7.166344,-12.0556)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2917"
-         style="opacity:0.1;fill:url(#radialGradient3026);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.233813,0,0,1.235135,-4.890235,-6.055598)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2919"
-         style="opacity:0.7;fill:url(#radialGradient3028);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2925"
-         style="opacity:1;fill:url(#radialGradient3030);fill-opacity:1;stroke:#555753;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.43667,0,0,0.429141,14.09824,21.41158)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2927"
-         style="opacity:1;fill:url(#radialGradient3032);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccssccc"
-         id="path2929"
-         d="M 27.35249,32.125 C 25.613836,32.860383 24.806671,34.177948 23.67433,35.292277 C 23.188021,35.599877 23.07463,36.001723 23.15468,36.568962 C 23.23473,37.136205 23.644126,37.624296 24.196826,37.787146 C 24.749524,37.949994 25.196373,37.917185 25.574713,37.485007 C 26.676195,35.285524 28.744563,33.983863 31,32.85591 C 29.870496,32.536987 28.651039,32.264053 27.35249,32.125 z"
-         style="opacity:0.7;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 23.8125,31.5 C 20.473005,31.5 17.440949,32.183256 15.34375,33.25 C 13.246551,34.316744 12.21875,35.666366 12.21875,36.90625 C 12.21875,38.146134 13.246551,39.495756 15.34375,40.5625 C 17.440949,41.629244 20.473005,42.312501 23.8125,42.3125 C 27.151995,42.3125 30.184051,41.629244 32.28125,40.5625 C 34.378449,39.495756 35.40625,38.146134 35.40625,36.90625 C 35.40625,35.666366 34.378449,34.316744 32.28125,33.25 C 30.184051,32.183256 27.151995,31.5 23.8125,31.5 z"
-         id="path2931"
-         style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient3036);stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         inkscape:original="M 23.8125 30.5 C 16.859872 30.5 11.21875 33.368948 11.21875 36.90625 C 11.21875 40.443552 16.859872 43.312502 23.8125 43.3125 C 30.765128 43.3125 36.406249 40.443552 36.40625 36.90625 C 36.40625 33.368948 30.765128 30.5 23.8125 30.5 z "
-         inkscape:radius="-0.99470079"
-         sodipodi:type="inkscape:offset" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2933"
-         d="M 24.5,27.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3038);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2935"
-         d="M 34.500008,18.999997 C 34.5,23.285708 30.040008,26.499998 24.500006,26.499998 C 18.960004,26.499998 14.5,23.285708 14.500003,18.999997"
-         style="fill:none;fill-opacity:1;stroke:#888a85;stroke-width:3.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="12.5"
-         height="2.9999995"
-         width="4"
-         id="rect2937"
-         style="opacity:1;fill:url(#linearGradient3040);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="32.5"
-         height="2.9999995"
-         width="4"
-         id="rect2939"
-         style="opacity:1;fill:url(#linearGradient3042);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2941"
-         d="M 34.500008,18.999991 C 34.500008,23.285701 30.040008,26.499992 24.500006,26.499992 C 18.960004,26.499992 14.5,23.285701 14.500003,18.999991"
-         style="fill:none;fill-opacity:1;stroke:url(#linearGradient3044);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="30"
-         height="6"
-         width="3.0000005"
-         id="rect2943"
-         style="opacity:1;fill:url(#linearGradient3046);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,12.25,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2945"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="16"
-         height="6"
-         width="3.0000005"
-         id="rect2947"
-         style="opacity:1;fill:url(#linearGradient3048);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="7.0108709"
-         rx="7.0000019"
-         y="1.5000002"
-         x="17.499996"
-         height="24.000008"
-         width="14.000004"
-         id="rect2949"
-         style="opacity:1;fill:url(#linearGradient3050);fill-opacity:1;stroke:url(#linearGradient3052);stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2951"
-         d="M 24.5,26.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3054);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,-7.75,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2953"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <g
-         id="g2955"
-         style="display:inline">
-        <rect
-           style="opacity:1;fill:url(#linearGradient3056);fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="rect2957"
-           width="4"
-           height="15.374996"
-           x="20"
-           y="6"
-           rx="2"
-           ry="2.1991496" />
-        <path
-           sodipodi:type="inkscape:offset"
-           inkscape:radius="-0.54470092"
-           inkscape:original="M 24.5 2.5 C 20.621999 2.5 17.5 5.615977 17.5 9.5 L 17.5 19.5 C 17.5 23.384022 20.621999 26.5 24.5 26.5 C 28.378001 26.5 31.5 23.384022 31.5 19.5 L 31.5 9.5 C 31.5 5.6159775 28.378001 2.5 24.5 2.5 z "
-           style="opacity:0.2;fill:url(#linearGradient3058);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="path2959"
-           d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,19.5 C 18.03125,23.092133 20.913778,25.96875 24.5,25.96875 C 28.086222,25.96875 30.96875,23.092133 30.96875,19.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-           transform="translate(0,-1)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:url(#linearGradient3060);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path2961"
-           sodipodi:cx="23.65625"
-           sodipodi:cy="7.6875"
-           sodipodi:rx="3.34375"
-           sodipodi:ry="3.0625"
-           d="M 27,7.6875 A 3.34375,3.0625 0 1 1 20.3125,7.6875 A 3.34375,3.0625 0 1 1 27,7.6875 z"
-           transform="matrix(1,0,0,1.081633,-0.375,-1.252551)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path2963"
-         d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,14.5 L 30.96875,14.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-         style="opacity:0.9;fill:url(#radialGradient3062);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         transform="translate(0,-1)" />
-      <path
-         sodipodi:nodetypes="csssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssc"
-         id="path2965"
-         d="M 22.5,3 C 22.224,3 22,3.224 22,3.5 C 22,3.776 22.224,4 22.5,4 C 22.776,4 23,3.776 23,3.5 C 23,3.224 22.776,3 22.5,3 z M 24.5,3 C 24.224,3 24,3.224 24,3.5 C 24,3.776 24.224,4 24.5,4 C 24.776,4 25,3.776 25,3.5 C 25,3.224 24.776,3 24.5,3 z M 26.5,3 C 26.224,3 26,3.224 26,3.5 C 26,3.776 26.224,4 26.5,4 C 26.776,4 27,3.776 27,3.5 C 27,3.224 26.776,3 26.5,3 z M 21.5,4 C 21.224,4 21,4.224 21,4.5 C 21,4.776 21.224,5 21.5,5 C 21.776,5 22,4.776 22,4.5 C 22,4.224 21.776,4 21.5,4 z M 23.5,4 C 23.224,4 22.999999,4.2240007 23,4.5 C 23,4.7759993 23.223999,5 23.5,5 C 23.776,5 24,4.7759993 24,4.5 C 24,4.2240007 23.776,4 23.5,4 z M 25.5,4 C 25.224,4 24.999999,4.2240007 25,4.5 C 25,4.7759993 25.223999,5 25.5,5 C 25.776,5 26,4.7759993 26,4.5 C 26,4.2240007 25.776,4 25.5,4 z M 27.5,4 C 27.224,4 27,4.224 27,4.5 C 27,4.776 27.224,5 27.5,5 C 27.776,5 28,4.776 28,4.5 C 28,4.224 27.776,4 27.5,4 z M 20.5,5 C 20.224,5 19.999999,5.2240008 20,5.5 C 20,5.7759993 20.223999,6 20.5,6 C 20.776,6 21,5.7759994 21,5.5 C 21,5.2240007 20.776,5 20.5,5 z M 22.5,5 C 22.224,5 21.999999,5.2240008 22,5.5 C 22,5.7759993 22.223999,6 22.5,6 C 22.776,6 23,5.7759994 23,5.5 C 23,5.2240007 22.776,5 22.5,5 z M 24.5,5 C 24.224,5 23.999999,5.2240008 24,5.5 C 24,5.7759993 24.223999,6 24.5,6 C 24.776,6 25,5.7759994 25,5.5 C 25,5.2240007 24.776,5 24.5,5 z M 26.5,5 C 26.224,5 25.999999,5.2240008 26,5.5 C 26,5.7759993 26.223999,6 26.5,6 C 26.776,6 27,5.7759994 27,5.5 C 27,5.2240007 26.776,5 26.5,5 z M 28.5,5 C 28.224,5 28,5.224 28,5.5 C 28,5.776 28.224,6 28.5,6 C 28.776,6 29,5.776 29,5.5 C 29,5.224 28.776,5 28.5,5 z M 19.5,6 C 19.224,6 18.999999,6.2240008 19,6.5 C 19,6.7759993 19.223999,7 19.5,7 C 19.776,7 20,6.7759994 20,6.5 C 20,6.2240007 19.776,6 19.5,6 z M 21.5,6 C 21.224,6 20.999999,6.2240008 21,6.5 C 21,6.7759993 21.223999,7 21.5,7 C 21.776,7 22,6.7759994 22,6.5 C 22,6.2240007 21.776,6 21.5,6 z M 23.5,6 C 23.224,6 22.999999,6.2240008 23,6.5 C 23,6.7759993 23.223999,7 23.5,7 C 23.776,7 24,6.7759994 24,6.5 C 24,6.2240007 23.776,6 23.5,6 z M 25.5,6 C 25.224,6 24.999999,6.2240008 25,6.5 C 25,6.7759993 25.223999,7 25.5,7 C 25.776,7 26,6.7759994 26,6.5 C 26,6.2240007 25.776,6 25.5,6 z M 27.5,6 C 27.224,6 26.999999,6.2240008 27,6.5 C 27,6.7759993 27.223999,7 27.5,7 C 27.776,7 28,6.7759994 28,6.5 C 28,6.2240007 27.776,6 27.5,6 z M 29.5,6 C 29.224,6 29,6.224 29,6.5 C 29,6.776 29.224,7 29.5,7 C 29.776,7 30,6.776 30,6.5 C 30,6.224 29.776,6 29.5,6 z M 20.5,7 C 20.224,7 19.999999,7.2240008 20,7.5 C 20,7.7759993 20.223999,8.0000002 20.5,8 C 20.776,8 21,7.7759994 21,7.5 C 21,7.2240007 20.776,7 20.5,7 z M 22.5,7 C 22.224,7 21.999999,7.2240008 22,7.5 C 22,7.7759993 22.223999,8.0000002 22.5,8 C 22.776,8 23,7.7759994 23,7.5 C 23,7.2240007 22.776,7 22.5,7 z M 24.5,7 C 24.224,7 23.999999,7.2240008 24,7.5 C 24,7.7759993 24.223999,8.0000002 24.5,8 C 24.776,8 25,7.7759994 25,7.5 C 25,7.2240007 24.776,7 24.5,7 z M 26.5,7 C 26.224,7 25.999999,7.2240008 26,7.5 C 26,7.7759993 26.223999,8.0000002 26.5,8 C 26.776,8 27,7.7759994 27,7.5 C 27,7.2240007 26.776,7 26.5,7 z M 28.5,7 C 28.224,7 27.999999,7.2240008 28,7.5 C 28,7.7759993 28.223999,8.0000002 28.5,8 C 28.776,8 29,7.7759994 29,7.5 C 29,7.2240007 28.776,7 28.5,7 z M 30.5,7 C 30.224,7 30,7.224 30,7.5 C 30,7.776 30.224,8 30.5,8 C 30.776,8 31,7.776 31,7.5 C 31,7.224 30.776,7 30.5,7 z M 19.5,8 C 19.224,8 18.999999,8.2240008 19,8.5 C 19,8.7759993 19.223999,9 19.5,9 C 19.776,9 20,8.7759994 20,8.5 C 20,8.2240007 19.776,8 19.5,8 z M 21.5,8 C 21.224,8 20.999999,8.2240008 21,8.5 C 21,8.7759993 21.223999,9 21.5,9 C 21.776,9 22,8.7759994 22,8.5 C 22,8.2240007 21.776,8 21.5,8 z M 23.5,8 C 23.224,8 22.999999,8.2240008 23,8.5 C 23,8.7759993 23.223999,9 23.5,9 C 23.776,9 24,8.7759994 24,8.5 C 24,8.2240007 23.776,8 23.5,8 z M 25.5,8 C 25.224,8 24.999999,8.2240008 25,8.5 C 25,8.7759993 25.223999,9 25.5,9 C 25.776,9 26,8.7759994 26,8.5 C 26,8.2240007 25.776,8 25.5,8 z M 27.5,8 C 27.224,8 26.999999,8.2240008 27,8.5 C 27,8.7759993 27.223999,9 27.5,9 C 27.776,9 28,8.7759994 28,8.5 C 28,8.2240007 27.776,8 27.5,8 z M 29.5,8 C 29.224,8 28.999999,8.2240008 29,8.5 C 29,8.7759993 29.223999,9 29.5,9 C 29.776,9 30,8.7759994 30,8.5 C 30,8.2240007 29.776,8 29.5,8 z M 18.5,9 C 18.224,9 17.999999,9.224001 18,9.5 C 18,9.775999 18.223999,10 18.5,10 C 18.776,10 19,9.775999 19,9.5 C 19,9.224001 18.776,9 18.5,9 z M 20.5,9 C 20.224,9 19.999999,9.224001 20,9.5 C 20,9.775999 20.223999,10 20.5,10 C 20.776,10 21,9.775999 21,9.5 C 21,9.224001 20.776,9 20.5,9 z M 22.5,9 C 22.224,9 21.999999,9.224001 22,9.5 C 22,9.775999 22.223999,10 22.5,10 C 22.776,10 23,9.775999 23,9.5 C 23,9.224001 22.776,9 22.5,9 z M 24.5,9 C 24.224,9 23.999999,9.224001 24,9.5 C 24,9.775999 24.223999,10 24.5,10 C 24.776,10 25,9.775999 25,9.5 C 25,9.224001 24.776,9 24.5,9 z M 26.5,9 C 26.224,9 25.999999,9.224001 26,9.5 C 26,9.775999 26.223999,10 26.5,10 C 26.776,10 27,9.775999 27,9.5 C 27,9.224001 26.776,9 26.5,9 z M 28.5,9 C 28.224,9 27.999999,9.224001 28,9.5 C 28,9.775999 28.223999,10 28.5,10 C 28.776,10 29,9.775999 29,9.5 C 29,9.224001 28.776,9 28.5,9 z M 30.5,9 C 30.224,9 30,9.224 30,9.5 C 30,9.776 30.224,10 30.5,10 C 30.776,10 31,9.776 31,9.5 C 31,9.224 30.776,9 30.5,9 z M 19.5,10 C 19.224,10 18.999999,10.224001 19,10.5 C 19,10.775999 19.223999,11 19.5,11 C 19.776,11 20,10.775999 20,10.5 C 20,10.224001 19.776,10 19.5,10 z M 21.5,10 C 21.224,10 20.999999,10.224001 21,10.5 C 21,10.775999 21.223999,11 21.5,11 C 21.776,11 22,10.775999 22,10.5 C 22,10.224001 21.776,10 21.5,10 z M 23.5,10 C 23.224,10 22.999999,10.224001 23,10.5 C 23,10.775999 23.223999,11 23.5,11 C 23.776,11 24,10.775999 24,10.5 C 24,10.224001 23.776,10 23.5,10 z M 25.5,10 C 25.224,10 24.999999,10.224001 25,10.5 C 25,10.775999 25.223999,11 25.5,11 C 25.776,11 26,10.775999 26,10.5 C 26,10.224001 25.776,10 25.5,10 z M 27.5,10 C 27.224,10 26.999999,10.224001 27,10.5 C 27,10.775999 27.223999,11 27.5,11 C 27.776,11 28,10.775999 28,10.5 C 28,10.224001 27.776,10 27.5,10 z M 29.5,10 C 29.224,10 28.999999,10.224001 29,10.5 C 29,10.775999 29.223999,11 29.5,11 C 29.776,11 30,10.775999 30,10.5 C 30,10.224001 29.776,10 29.5,10 z M 18.5,11 C 18.224,11 17.999999,11.224 18,11.5 C 18,11.775999 18.223999,12 18.5,12 C 18.776,12 19,11.775999 19,11.5 C 19,11.224001 18.776,11 18.5,11 z M 20.5,11 C 20.224,11 19.999999,11.224 20,11.5 C 20,11.775999 20.223999,12 20.5,12 C 20.776,12 21,11.775999 21,11.5 C 21,11.224001 20.776,11 20.5,11 z M 22.5,11 C 22.224,11 21.999999,11.224 22,11.5 C 22,11.775999 22.223999,12 22.5,12 C 22.776,12 23,11.775999 23,11.5 C 23,11.224001 22.776,11 22.5,11 z M 24.5,11 C 24.224,11 23.999999,11.224 24,11.5 C 24,11.775999 24.223999,12 24.5,12 C 24.776,12 25,11.775999 25,11.5 C 25,11.224001 24.776,11 24.5,11 z M 26.5,11 C 26.224,11 25.999999,11.224 26,11.5 C 26,11.775999 26.223999,12 26.5,12 C 26.776,12 27,11.775999 27,11.5 C 27,11.224001 26.776,11 26.5,11 z M 28.5,11 C 28.224,11 27.999999,11.224 28,11.5 C 28,11.775999 28.223999,12 28.5,12 C 28.776,12 29,11.775999 29,11.5 C 29,11.224001 28.776,11 28.5,11 z M 30.5,11 C 30.224,11 30,11.224 30,11.5 C 30,11.776 30.224,12 30.5,12 C 30.776,12 31,11.776 31,11.5 C 31,11.224 30.776,11 30.5,11 z M 19.5,12 C 19.224,12 18.999999,12.224 19,12.5 C 19,12.775999 19.223999,13 19.5,13 C 19.776,13 20,12.775999 20,12.5 C 20,12.224001 19.776,12 19.5,12 z M 21.5,12 C 21.224,12 20.999999,12.224 21,12.5 C 21,12.775999 21.223999,13 21.5,13 C 21.776,13 22,12.775999 22,12.5 C 22,12.224001 21.776,12 21.5,12 z M 23.5,12 C 23.224,12 22.999999,12.224 23,12.5 C 23,12.775999 23.223999,13 23.5,13 C 23.776,13 24,12.775999 24,12.5 C 24,12.224001 23.776,12 23.5,12 z M 25.5,12 C 25.224,12 24.999999,12.224 25,12.5 C 25,12.775999 25.223999,13 25.5,13 C 25.776,13 26,12.775999 26,12.5 C 26,12.224001 25.776,12 25.5,12 z M 27.5,12 C 27.224,12 26.999999,12.224 27,12.5 C 27,12.775999 27.223999,13 27.5,13 C 27.776,13 28,12.775999 28,12.5 C 28,12.224001 27.776,12 27.5,12 z M 29.5,12 C 29.224,12 28.999999,12.224 29,12.5 C 29,12.775999 29.223999,13 29.5,13 C 29.776,13 30,12.775999 30,12.5 C 30,12.224001 29.776,12 29.5,12 z M 18.5,13 C 18.224,13 17.999999,13.224 18,13.5 C 18,13.775999 18.223999,14 18.5,14 C 18.776,14 19,13.775999 19,13.5 C 19,13.224001 18.776,13 18.5,13 z M 20.5,13 C 20.224,13 19.999999,13.224 20,13.5 C 20,13.775999 20.223999,14 20.5,14 C 20.776,14 21,13.775999 21,13.5 C 21,13.224001 20.776,13 20.5,13 z M 22.5,13 C 22.224,13 21.999999,13.224 22,13.5 C 22,13.775999 22.223999,14 22.5,14 C 22.776,14 23,13.775999 23,13.5 C 23,13.224001 22.776,13 22.5,13 z M 24.5,13 C 24.224,13 23.999999,13.224 24,13.5 C 24,13.775999 24.223999,14 24.5,14 C 24.776,14 25,13.775999 25,13.5 C 25,13.224001 24.776,13 24.5,13 z M 26.5,13 C 26.224,13 25.999999,13.224 26,13.5 C 26,13.775999 26.223999,14 26.5,14 C 26.776,14 27,13.775999 27,13.5 C 27,13.224001 26.776,13 26.5,13 z M 28.5,13 C 28.224,13 27.999999,13.224 28,13.5 C 28,13.775999 28.223999,14 28.5,14 C 28.776,14 29,13.775999 29,13.5 C 29,13.224001 28.776,13 28.5,13 z M 30.5,13 C 30.224,13 30,13.224 30,13.5 C 30,13.776 30.224,14 30.5,14 C 30.776,14 31,13.776 31,13.5 C 31,13.224 30.776,13 30.5,13 z M 19.5,14 C 19.224,14 18.999999,14.224 19,14.5 C 19,14.775999 19.223999,15 19.5,15 C 19.776,15 20,14.775999 20,14.5 C 20,14.224001 19.776,14 19.5,14 z M 21.5,14 C 21.224,14 20.999999,14.224 21,14.5 C 21,14.775999 21.223999,15 21.5,15 C 21.776,15 22,14.775999 22,14.5 C 22,14.224001 21.776,14 21.5,14 z M 23.5,14 C 23.224,14 22.999999,14.224 23,14.5 C 23,14.775999 23.223999,15 23.5,15 C 23.776,15 24,14.775999 24,14.5 C 24,14.224001 23.776,14 23.5,14 z M 25.5,14 C 25.224,14 24.999999,14.224 25,14.5 C 25,14.775999 25.223999,15 25.5,15 C 25.776,15 26,14.775999 26,14.5 C 26,14.224001 25.776,14 25.5,14 z M 27.5,14 C 27.224,14 26.999999,14.224 27,14.5 C 27,14.775999 27.223999,15 27.5,15 C 27.776,15 28,14.775999 28,14.5 C 28,14.224001 27.776,14 27.5,14 z M 29.5,14 C 29.224,14 28.999999,14.224 29,14.5 C 29,14.775999 29.223999,15 29.5,15 C 29.776,15 30,14.775999 30,14.5 C 30,14.224001 29.776,14 29.5,14 z M 18.5,15 C 18.224,15 17.999999,15.224 18,15.5 C 18,15.775999 18.223999,16 18.5,16 C 18.776,16 19,15.775999 19,15.5 C 19,15.224001 18.776,15 18.5,15 z M 20.5,15 C 20.224,15 19.999999,15.224 20,15.5 C 20,15.775999 20.223999,16 20.5,16 C 20.776,16 21,15.775999 21,15.5 C 21,15.224001 20.776,15 20.5,15 z M 22.5,15 C 22.224,15 21.999999,15.224 22,15.5 C 22,15.775999 22.223999,16 22.5,16 C 22.776,16 23,15.775999 23,15.5 C 23,15.224001 22.776,15 22.5,15 z M 24.5,15 C 24.224,15 23.999999,15.224 24,15.5 C 24,15.775999 24.223999,16 24.5,16 C 24.776,16 25,15.775999 25,15.5 C 25,15.224001 24.776,15 24.5,15 z M 26.5,15 C 26.224,15 25.999999,15.224 26,15.5 C 26,15.775999 26.223999,16 26.5,16 C 26.776,16 27,15.775999 27,15.5 C 27,15.224001 26.776,15 26.5,15 z M 28.5,15 C 28.224,15 27.999999,15.224 28,15.5 C 28,15.775999 28.223999,16 28.5,16 C 28.776,16 29,15.775999 29,15.5 C 29,15.224001 28.776,15 28.5,15 z M 30.5,15 C 30.224,15 30,15.224 30,15.5 C 30,15.776 30.224,16 30.5,16 C 30.776,16 31,15.776 31,15.5 C 31,15.224 30.776,15 30.5,15 z M 19.5,16 C 19.224,16 18.999999,16.224001 19,16.5 C 19,16.775999 19.223999,17 19.5,17 C 19.776,17 20,16.776 20,16.5 C 20,16.224001 19.776,16 19.5,16 z M 21.5,16 C 21.224,16 20.999999,16.224001 21,16.5 C 21,16.775999 21.223999,17 21.5,17 C 21.776,17 22,16.776 22,16.5 C 22,16.224001 21.776,16 21.5,16 z M 23.5,16 C 23.224,16 22.999999,16.224001 23,16.5 C 23,16.775999 23.223999,17 23.5,17 C 23.776,17 24,16.776 24,16.5 C 24,16.224001 23.776,16 23.5,16 z M 25.5,16 C 25.224,16 24.999999,16.224001 25,16.5 C 25,16.775999 25.223999,17 25.5,17 C 25.776,17 26,16.776 26,16.5 C 26,16.224001 25.776,16 25.5,16 z M 27.5,16 C 27.224,16 26.999999,16.224001 27,16.5 C 27,16.775999 27.223999,17 27.5,17 C 27.776,17 28,16.776 28,16.5 C 28,16.224001 27.776,16 27.5,16 z M 29.5,16 C 29.224,16 28.999999,16.224 29,16.5 C 29,16.775999 29.223999,17 29.5,17 C 29.776,17 30,16.775999 30,16.5 C 30,16.224001 29.776,16 29.5,16 z M 18.5,17 C 18.224,17 17.999999,17.224001 18,17.5 C 18,17.775999 18.223999,18 18.5,18 C 18.776,18 19,17.776 19,17.5 C 19,17.224001 18.776,17 18.5,17 z M 20.5,17 C 20.224,17 19.999999,17.224001 20,17.5 C 20,17.775999 20.223999,18 20.5,18 C 20.776,18 21,17.776 21,17.5 C 21,17.224001 20.776,17 20.5,17 z M 22.5,17 C 22.224,17 21.999999,17.224001 22,17.5 C 22,17.775999 22.223999,18 22.5,18 C 22.776,18 23,17.776 23,17.5 C 23,17.224001 22.776,17 22.5,17 z M 24.5,17 C 24.224,17 23.999999,17.224001 24,17.5 C 24,17.775999 24.223999,18 24.5,18 C 24.776,18 25,17.776 25,17.5 C 25,17.224001 24.776,17 24.5,17 z M 26.5,17 C 26.224,17 25.999999,17.224001 26,17.5 C 26,17.775999 26.223999,18 26.5,18 C 26.776,18 27,17.776 27,17.5 C 27,17.224001 26.776,17 26.5,17 z M 28.5,17 C 28.224,17 27.999999,17.224001 28,17.5 C 28,17.775999 28.223999,18 28.5,18 C 28.776,18 29,17.776 29,17.5 C 29,17.224001 28.776,17 28.5,17 z M 30.5,17 C 30.224,17 30,17.224 30,17.5 C 30,17.776 30.224,18 30.5,18 C 30.776,18 31,17.776 31,17.5 C 31,17.224 30.776,17 30.5,17 z M 19.5,18 C 19.224,18 18.999999,18.224001 19,18.5 C 19,18.775999 19.223999,19 19.5,19 C 19.776,19 20,18.776 20,18.5 C 20,18.224001 19.776,18 19.5,18 z M 21.5,18 C 21.224,18 20.999999,18.224001 21,18.5 C 21,18.775999 21.223999,19 21.5,19 C 21.776,19 22,18.776 22,18.5 C 22,18.224001 21.776,18 21.5,18 z M 23.5,18 C 23.224,18 22.999999,18.224001 23,18.5 C 23,18.775999 23.223999,19 23.5,19 C 23.776,19 24,18.776 24,18.5 C 24,18.224001 23.776,18 23.5,18 z M 25.5,18 C 25.224,18 24.999999,18.224001 25,18.5 C 25,18.775999 25.223999,19 25.5,19 C 25.776,19 26,18.776 26,18.5 C 26,18.224001 25.776,18 25.5,18 z M 27.5,18 C 27.224,18 26.999999,18.224001 27,18.5 C 27,18.775999 27.223999,19 27.5,19 C 27.776,19 28,18.776 28,18.5 C 28,18.224001 27.776,18 27.5,18 z M 29.5,18 C 29.224,18 28.999999,18.224001 29,18.5 C 29,18.775999 29.223999,19 29.5,19 C 29.776,19 30,18.776 30,18.5 C 30,18.224001 29.776,18 29.5,18 z M 18.5,19 C 18.224,19 17.999999,19.224001 18,19.5 C 18,19.775999 18.223999,19.999999 18.5,20 C 18.776,20 19,19.776 19,19.5 C 19,19.224001 18.776,19 18.5,19 z M 20.5,19 C 20.224,19 19.999999,19.224001 20,19.5 C 20,19.775999 20.223999,19.999999 20.5,20 C 20.776,20 21,19.776 21,19.5 C 21,19.224001 20.776,19 20.5,19 z M 22.5,19 C 22.224,19 21.999999,19.224001 22,19.5 C 22,19.775999 22.223999,19.999999 22.5,20 C 22.776,20 23,19.776 23,19.5 C 23,19.224001 22.776,19 22.5,19 z M 24.5,19 C 24.224,19 23.999999,19.224001 24,19.5 C 24,19.775999 24.223999,19.999999 24.5,20 C 24.776,20 25,19.776 25,19.5 C 25,19.224001 24.776,19 24.5,19 z M 26.5,19 C 26.224,19 25.999999,19.224001 26,19.5 C 26,19.775999 26.223999,19.999999 26.5,20 C 26.776,20 27,19.776 27,19.5 C 27,19.224001 26.776,19 26.5,19 z M 28.5,19 C 28.224,19 27.999999,19.224001 28,19.5 C 28,19.775999 28.223999,19.999999 28.5,20 C 28.776,20 29,19.776 29,19.5 C 29,19.224001 28.776,19 28.5,19 z M 30.5,19 C 30.224,19 30,19.224 30,19.5 C 30,19.776 30.224,20 30.5,20 C 30.776,20 31,19.776 31,19.5 C 31,19.224 30.776,19 30.5,19 z M 19.5,20 C 19.224,20 18.999999,20.224001 19,20.5 C 19,20.775999 19.223999,20.999999 19.5,21 C 19.776,21 20,20.776 20,20.5 C 20,20.224001 19.776,20 19.5,20 z M 21.5,20 C 21.224,20 20.999999,20.224001 21,20.5 C 21,20.775999 21.223999,20.999999 21.5,21 C 21.776,21 22,20.776 22,20.5 C 22,20.224001 21.776,20 21.5,20 z M 23.5,20 C 23.224,20 22.999999,20.224001 23,20.5 C 23,20.775999 23.223999,20.999999 23.5,21 C 23.776,21 24,20.776 24,20.5 C 24,20.224001 23.776,20 23.5,20 z M 25.5,20 C 25.224,20 24.999999,20.224001 25,20.5 C 25,20.775999 25.223999,20.999999 25.5,21 C 25.776,21 26,20.776 26,20.5 C 26,20.224001 25.776,20 25.5,20 z M 27.5,20 C 27.224,20 26.999999,20.224001 27,20.5 C 27,20.775999 27.223999,20.999999 27.5,21 C 27.776,21 28,20.776 28,20.5 C 28,20.224001 27.776,20 27.5,20 z M 29.5,20 C 29.224,20 28.999999,20.224001 29,20.5 C 29,20.775999 29.223999,20.999999 29.5,21 C 29.776,21 30,20.776 30,20.5 C 30,20.224001 29.776,20 29.5,20 z M 20.5,21 C 20.224,21 19.999999,21.224001 20,21.5 C 20,21.775999 20.223999,21.999999 20.5,22 C 20.776,22 21,21.776 21,21.5 C 21,21.224001 20.776,21 20.5,21 z M 22.5,21 C 22.224,21 21.999999,21.224001 22,21.5 C 22,21.775999 22.223999,21.999999 22.5,22 C 22.776,22 23,21.776 23,21.5 C 23,21.224001 22.776,21 22.5,21 z M 24.5,21 C 24.224,21 23.999999,21.224001 24,21.5 C 24,21.775999 24.223999,21.999999 24.5,22 C 24.776,22 25,21.776 25,21.5 C 25,21.224001 24.776,21 24.5,21 z M 26.5,21 C 26.224,21 25.999999,21.224001 26,21.5 C 26,21.775999 26.223999,21.999999 26.5,22 C 26.776,22 27,21.776 27,21.5 C 27,21.224001 26.776,21 26.5,21 z M 28.5,21 C 28.224,21 27.999999,21.224001 28,21.5 C 28,21.775999 28.223999,21.999999 28.5,22 C 28.776,22 29,21.776 29,21.5 C 29,21.224001 28.776,21 28.5,21 z M 21.5,22 C 21.224,22 20.999999,22.224001 21,22.5 C 21,22.775999 21.223999,22.999999 21.5,23 C 21.776,23 22,22.776 22,22.5 C 22,22.224001 21.776,22 21.5,22 z M 23.5,22 C 23.224,22 22.999999,22.224001 23,22.5 C 23,22.775999 23.223999,22.999999 23.5,23 C 23.776,23 24,22.776 24,22.5 C 24,22.224001 23.776,22 23.5,22 z M 25.5,22 C 25.224,22 24.999999,22.224001 25,22.5 C 25,22.775999 25.223999,22.999999 25.5,23 C 25.776,23 26,22.776 26,22.5 C 26,22.224001 25.776,22 25.5,22 z M 27.5,22 C 27.224,22 26.999999,22.224001 27,22.5 C 27,22.775999 27.223999,22.999999 27.5,23 C 27.776,23 28,22.776 28,22.5 C 28,22.224001 27.776,22 27.5,22 z M 22.5,23 C 22.224,23 21.999999,23.224001 22,23.5 C 22,23.775999 22.223999,23.999999 22.5,24 C 22.776,24 23,23.776 23,23.5 C 23,23.224001 22.776,23 22.5,23 z M 24.5,23 C 24.224,23 23.999999,23.224001 24,23.5 C 24,23.775999 24.223999,23.999999 24.5,24 C 24.776,24 25,23.776 25,23.5 C 25,23.224001 24.776,23 24.5,23 z M 26.5,23 C 26.224,23 25.999999,23.224001 26,23.5 C 26,23.775999 26.223999,23.999999 26.5,24 C 26.776,24 27,23.776 27,23.5 C 27,23.224001 26.776,23 26.5,23 z M 23.5,24 C 23.224,24 22.999999,24.224001 23,24.5 C 23,24.775999 23.223999,24.999999 23.5,25 C 23.776,25 24,24.776 24,24.5 C 24,24.224001 23.776,24 23.5,24 z M 25.5,24 C 25.224,24 24.999999,24.224001 25,24.5 C 25,24.775999 25.223999,24.999999 25.5,25 C 25.776,25 26,24.776 26,24.5 C 26,24.224001 25.776,24 25.5,24 z"
-         style="opacity:0.5;fill:url(#linearGradient3064);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="6.0500031"
-         rx="6.0000024"
-         y="2.5000026"
-         x="18.500008"
-         height="22.000008"
-         width="12.000005"
-         id="rect2967"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3066);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:#729fcf;display:inline"
-       id="g28807"
-       transform="matrix(0.272091,0,0,0.9423324,-15.475768,-4.3498543)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path27920"
-         d="M 74.954806,30.15625 C 77.22438,28.375887 78.673556,25.606103 78.673556,22.5 C 78.673556,19.560794 77.36198,16.939552 75.298556,15.15625"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3377);stroke-width:1.52005064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-medium.svg b/mate-volume-control/data/icons/scalable/status/audio-input-microphone-medium.svg
deleted file mode 100644
index ba8b5a4..0000000
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-medium.svg
+++ /dev/null
@@ -1,1066 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2790"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="audio-input-mic-medium.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2792">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.6828427,-122.46854,-61.286186)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6964"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6976"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient6958">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop6960" />
-      <stop
-         id="stop6966"
-         offset="0.60000002"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0;"
-         offset="1"
-         id="stop6962" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6984"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-69.461,-45.746674)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3579">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3581" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3583" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3585"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)" />
-    <linearGradient
-       id="linearGradient3228">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3230" />
-      <stop
-         id="stop3573"
-         offset="0.06770357"
-         style="stop-color:black;stop-opacity:0.42857143;" />
-      <stop
-         id="stop3569"
-         offset="0.29894069"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         style="stop-color:black;stop-opacity:0.49803922;"
-         offset="0.77437174"
-         id="stop3571" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3567"
-       gradientUnits="userSpaceOnUse"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399"
-       gradientTransform="translate(0,3)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2920">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2922" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2924" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient2926"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2877">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2879" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2881" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient2894"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3815">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2892"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2867">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2869" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2871" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient2890"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       id="linearGradient3734">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3736" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3738" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3740"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient4481">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4483" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop4485" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient4487"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2904">
-      <stop
-         id="stop2906"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0.21551724"
-         id="stop2910" />
-      <stop
-         id="stop2912"
-         offset="0.70243758"
-         style="stop-color:#c3c4c2;stop-opacity:1;" />
-      <stop
-         id="stop2908"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient2902"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2949"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2943">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop2945" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop2947" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientTransform="translate(14,0)" />
-    <linearGradient
-       id="linearGradient2981">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2983" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop2985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient2987"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientTransform="translate(20,-1)" />
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient3726">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3728" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop3730" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3732"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3703">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3705" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3707" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3709"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3779">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3781" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3783" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3785"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2965">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:0;"
-         offset="1"
-         id="stop2969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient2971"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3711"
-       inkscape:collect="always">
-      <stop
-         id="stop3713"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         id="stop3715"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3691"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4465">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="0"
-         id="stop4467" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0"
-         offset="1"
-         id="stop4469" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4465"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942"
-       gradientTransform="translate(-0.25,12.5)" />
-    <linearGradient
-       id="linearGradient4475"
-       inkscape:collect="always">
-      <stop
-         id="stop4477"
-         offset="0"
-         style="stop-color:black;stop-opacity:1" />
-      <stop
-         id="stop4479"
-         offset="1"
-         style="stop-color:black;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4475"
-       id="linearGradient4473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.25,13.5)"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient4505"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4499">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop4501" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop4503" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2798" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3371"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.6828427,-122.46854,-61.286186)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-53.287444,-45.746674)"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3026"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient3032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(14,0)"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient3048"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient3050"
-       gradientUnits="userSpaceOnUse"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient3052"
-       gradientUnits="userSpaceOnUse"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient3056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient3058"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient3060"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient3062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3)"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3066"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.270833"
-     inkscape:cx="23.999998"
-     inkscape:cy="23.999998"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="780"
-     inkscape:window-height="776"
-     inkscape:window-x="161"
-     inkscape:window-y="146" />
-  <metadata
-     id="metadata2795">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g2915"
-       transform="translate(7.6010187,0.1428571)">
-      <path
-         transform="matrix(0.727673,0,0,1.235135,7.166344,-12.0556)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2917"
-         style="opacity:0.1;fill:url(#radialGradient3026);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.233813,0,0,1.235135,-4.890235,-6.055598)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2919"
-         style="opacity:0.7;fill:url(#radialGradient3028);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2925"
-         style="opacity:1;fill:url(#radialGradient3030);fill-opacity:1;stroke:#555753;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.43667,0,0,0.429141,14.09824,21.41158)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2927"
-         style="opacity:1;fill:url(#radialGradient3032);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccssccc"
-         id="path2929"
-         d="M 27.35249,32.125 C 25.613836,32.860383 24.806671,34.177948 23.67433,35.292277 C 23.188021,35.599877 23.07463,36.001723 23.15468,36.568962 C 23.23473,37.136205 23.644126,37.624296 24.196826,37.787146 C 24.749524,37.949994 25.196373,37.917185 25.574713,37.485007 C 26.676195,35.285524 28.744563,33.983863 31,32.85591 C 29.870496,32.536987 28.651039,32.264053 27.35249,32.125 z"
-         style="opacity:0.7;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 23.8125,31.5 C 20.473005,31.5 17.440949,32.183256 15.34375,33.25 C 13.246551,34.316744 12.21875,35.666366 12.21875,36.90625 C 12.21875,38.146134 13.246551,39.495756 15.34375,40.5625 C 17.440949,41.629244 20.473005,42.312501 23.8125,42.3125 C 27.151995,42.3125 30.184051,41.629244 32.28125,40.5625 C 34.378449,39.495756 35.40625,38.146134 35.40625,36.90625 C 35.40625,35.666366 34.378449,34.316744 32.28125,33.25 C 30.184051,32.183256 27.151995,31.5 23.8125,31.5 z"
-         id="path2931"
-         style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient3036);stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         inkscape:original="M 23.8125 30.5 C 16.859872 30.5 11.21875 33.368948 11.21875 36.90625 C 11.21875 40.443552 16.859872 43.312502 23.8125 43.3125 C 30.765128 43.3125 36.406249 40.443552 36.40625 36.90625 C 36.40625 33.368948 30.765128 30.5 23.8125 30.5 z "
-         inkscape:radius="-0.99470079"
-         sodipodi:type="inkscape:offset" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2933"
-         d="M 24.5,27.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3038);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2935"
-         d="M 34.500008,18.999997 C 34.5,23.285708 30.040008,26.499998 24.500006,26.499998 C 18.960004,26.499998 14.5,23.285708 14.500003,18.999997"
-         style="fill:none;fill-opacity:1;stroke:#888a85;stroke-width:3.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="12.5"
-         height="2.9999995"
-         width="4"
-         id="rect2937"
-         style="opacity:1;fill:url(#linearGradient3040);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="32.5"
-         height="2.9999995"
-         width="4"
-         id="rect2939"
-         style="opacity:1;fill:url(#linearGradient3042);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2941"
-         d="M 34.500008,18.999991 C 34.500008,23.285701 30.040008,26.499992 24.500006,26.499992 C 18.960004,26.499992 14.5,23.285701 14.500003,18.999991"
-         style="fill:none;fill-opacity:1;stroke:url(#linearGradient3044);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="30"
-         height="6"
-         width="3.0000005"
-         id="rect2943"
-         style="opacity:1;fill:url(#linearGradient3046);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,12.25,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2945"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="16"
-         height="6"
-         width="3.0000005"
-         id="rect2947"
-         style="opacity:1;fill:url(#linearGradient3048);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="7.0108709"
-         rx="7.0000019"
-         y="1.5000002"
-         x="17.499996"
-         height="24.000008"
-         width="14.000004"
-         id="rect2949"
-         style="opacity:1;fill:url(#linearGradient3050);fill-opacity:1;stroke:url(#linearGradient3052);stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2951"
-         d="M 24.5,26.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3054);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,-7.75,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2953"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <g
-         id="g2955"
-         style="display:inline">
-        <rect
-           style="opacity:1;fill:url(#linearGradient3056);fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="rect2957"
-           width="4"
-           height="15.374996"
-           x="20"
-           y="6"
-           rx="2"
-           ry="2.1991496" />
-        <path
-           sodipodi:type="inkscape:offset"
-           inkscape:radius="-0.54470092"
-           inkscape:original="M 24.5 2.5 C 20.621999 2.5 17.5 5.615977 17.5 9.5 L 17.5 19.5 C 17.5 23.384022 20.621999 26.5 24.5 26.5 C 28.378001 26.5 31.5 23.384022 31.5 19.5 L 31.5 9.5 C 31.5 5.6159775 28.378001 2.5 24.5 2.5 z "
-           style="opacity:0.2;fill:url(#linearGradient3058);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="path2959"
-           d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,19.5 C 18.03125,23.092133 20.913778,25.96875 24.5,25.96875 C 28.086222,25.96875 30.96875,23.092133 30.96875,19.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-           transform="translate(0,-1)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:url(#linearGradient3060);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path2961"
-           sodipodi:cx="23.65625"
-           sodipodi:cy="7.6875"
-           sodipodi:rx="3.34375"
-           sodipodi:ry="3.0625"
-           d="M 27,7.6875 A 3.34375,3.0625 0 1 1 20.3125,7.6875 A 3.34375,3.0625 0 1 1 27,7.6875 z"
-           transform="matrix(1,0,0,1.081633,-0.375,-1.252551)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path2963"
-         d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,14.5 L 30.96875,14.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-         style="opacity:0.9;fill:url(#radialGradient3062);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         transform="translate(0,-1)" />
-      <path
-         sodipodi:nodetypes="csssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssc"
-         id="path2965"
-         d="M 22.5,3 C 22.224,3 22,3.224 22,3.5 C 22,3.776 22.224,4 22.5,4 C 22.776,4 23,3.776 23,3.5 C 23,3.224 22.776,3 22.5,3 z M 24.5,3 C 24.224,3 24,3.224 24,3.5 C 24,3.776 24.224,4 24.5,4 C 24.776,4 25,3.776 25,3.5 C 25,3.224 24.776,3 24.5,3 z M 26.5,3 C 26.224,3 26,3.224 26,3.5 C 26,3.776 26.224,4 26.5,4 C 26.776,4 27,3.776 27,3.5 C 27,3.224 26.776,3 26.5,3 z M 21.5,4 C 21.224,4 21,4.224 21,4.5 C 21,4.776 21.224,5 21.5,5 C 21.776,5 22,4.776 22,4.5 C 22,4.224 21.776,4 21.5,4 z M 23.5,4 C 23.224,4 22.999999,4.2240007 23,4.5 C 23,4.7759993 23.223999,5 23.5,5 C 23.776,5 24,4.7759993 24,4.5 C 24,4.2240007 23.776,4 23.5,4 z M 25.5,4 C 25.224,4 24.999999,4.2240007 25,4.5 C 25,4.7759993 25.223999,5 25.5,5 C 25.776,5 26,4.7759993 26,4.5 C 26,4.2240007 25.776,4 25.5,4 z M 27.5,4 C 27.224,4 27,4.224 27,4.5 C 27,4.776 27.224,5 27.5,5 C 27.776,5 28,4.776 28,4.5 C 28,4.224 27.776,4 27.5,4 z M 20.5,5 C 20.224,5 19.999999,5.2240008 20,5.5 C 20,5.7759993 20.223999,6 20.5,6 C 20.776,6 21,5.7759994 21,5.5 C 21,5.2240007 20.776,5 20.5,5 z M 22.5,5 C 22.224,5 21.999999,5.2240008 22,5.5 C 22,5.7759993 22.223999,6 22.5,6 C 22.776,6 23,5.7759994 23,5.5 C 23,5.2240007 22.776,5 22.5,5 z M 24.5,5 C 24.224,5 23.999999,5.2240008 24,5.5 C 24,5.7759993 24.223999,6 24.5,6 C 24.776,6 25,5.7759994 25,5.5 C 25,5.2240007 24.776,5 24.5,5 z M 26.5,5 C 26.224,5 25.999999,5.2240008 26,5.5 C 26,5.7759993 26.223999,6 26.5,6 C 26.776,6 27,5.7759994 27,5.5 C 27,5.2240007 26.776,5 26.5,5 z M 28.5,5 C 28.224,5 28,5.224 28,5.5 C 28,5.776 28.224,6 28.5,6 C 28.776,6 29,5.776 29,5.5 C 29,5.224 28.776,5 28.5,5 z M 19.5,6 C 19.224,6 18.999999,6.2240008 19,6.5 C 19,6.7759993 19.223999,7 19.5,7 C 19.776,7 20,6.7759994 20,6.5 C 20,6.2240007 19.776,6 19.5,6 z M 21.5,6 C 21.224,6 20.999999,6.2240008 21,6.5 C 21,6.7759993 21.223999,7 21.5,7 C 21.776,7 22,6.7759994 22,6.5 C 22,6.2240007 21.776,6 21.5,6 z M 23.5,6 C 23.224,6 22.999999,6.2240008 23,6.5 C 23,6.7759993 23.223999,7 23.5,7 C 23.776,7 24,6.7759994 24,6.5 C 24,6.2240007 23.776,6 23.5,6 z M 25.5,6 C 25.224,6 24.999999,6.2240008 25,6.5 C 25,6.7759993 25.223999,7 25.5,7 C 25.776,7 26,6.7759994 26,6.5 C 26,6.2240007 25.776,6 25.5,6 z M 27.5,6 C 27.224,6 26.999999,6.2240008 27,6.5 C 27,6.7759993 27.223999,7 27.5,7 C 27.776,7 28,6.7759994 28,6.5 C 28,6.2240007 27.776,6 27.5,6 z M 29.5,6 C 29.224,6 29,6.224 29,6.5 C 29,6.776 29.224,7 29.5,7 C 29.776,7 30,6.776 30,6.5 C 30,6.224 29.776,6 29.5,6 z M 20.5,7 C 20.224,7 19.999999,7.2240008 20,7.5 C 20,7.7759993 20.223999,8.0000002 20.5,8 C 20.776,8 21,7.7759994 21,7.5 C 21,7.2240007 20.776,7 20.5,7 z M 22.5,7 C 22.224,7 21.999999,7.2240008 22,7.5 C 22,7.7759993 22.223999,8.0000002 22.5,8 C 22.776,8 23,7.7759994 23,7.5 C 23,7.2240007 22.776,7 22.5,7 z M 24.5,7 C 24.224,7 23.999999,7.2240008 24,7.5 C 24,7.7759993 24.223999,8.0000002 24.5,8 C 24.776,8 25,7.7759994 25,7.5 C 25,7.2240007 24.776,7 24.5,7 z M 26.5,7 C 26.224,7 25.999999,7.2240008 26,7.5 C 26,7.7759993 26.223999,8.0000002 26.5,8 C 26.776,8 27,7.7759994 27,7.5 C 27,7.2240007 26.776,7 26.5,7 z M 28.5,7 C 28.224,7 27.999999,7.2240008 28,7.5 C 28,7.7759993 28.223999,8.0000002 28.5,8 C 28.776,8 29,7.7759994 29,7.5 C 29,7.2240007 28.776,7 28.5,7 z M 30.5,7 C 30.224,7 30,7.224 30,7.5 C 30,7.776 30.224,8 30.5,8 C 30.776,8 31,7.776 31,7.5 C 31,7.224 30.776,7 30.5,7 z M 19.5,8 C 19.224,8 18.999999,8.2240008 19,8.5 C 19,8.7759993 19.223999,9 19.5,9 C 19.776,9 20,8.7759994 20,8.5 C 20,8.2240007 19.776,8 19.5,8 z M 21.5,8 C 21.224,8 20.999999,8.2240008 21,8.5 C 21,8.7759993 21.223999,9 21.5,9 C 21.776,9 22,8.7759994 22,8.5 C 22,8.2240007 21.776,8 21.5,8 z M 23.5,8 C 23.224,8 22.999999,8.2240008 23,8.5 C 23,8.7759993 23.223999,9 23.5,9 C 23.776,9 24,8.7759994 24,8.5 C 24,8.2240007 23.776,8 23.5,8 z M 25.5,8 C 25.224,8 24.999999,8.2240008 25,8.5 C 25,8.7759993 25.223999,9 25.5,9 C 25.776,9 26,8.7759994 26,8.5 C 26,8.2240007 25.776,8 25.5,8 z M 27.5,8 C 27.224,8 26.999999,8.2240008 27,8.5 C 27,8.7759993 27.223999,9 27.5,9 C 27.776,9 28,8.7759994 28,8.5 C 28,8.2240007 27.776,8 27.5,8 z M 29.5,8 C 29.224,8 28.999999,8.2240008 29,8.5 C 29,8.7759993 29.223999,9 29.5,9 C 29.776,9 30,8.7759994 30,8.5 C 30,8.2240007 29.776,8 29.5,8 z M 18.5,9 C 18.224,9 17.999999,9.224001 18,9.5 C 18,9.775999 18.223999,10 18.5,10 C 18.776,10 19,9.775999 19,9.5 C 19,9.224001 18.776,9 18.5,9 z M 20.5,9 C 20.224,9 19.999999,9.224001 20,9.5 C 20,9.775999 20.223999,10 20.5,10 C 20.776,10 21,9.775999 21,9.5 C 21,9.224001 20.776,9 20.5,9 z M 22.5,9 C 22.224,9 21.999999,9.224001 22,9.5 C 22,9.775999 22.223999,10 22.5,10 C 22.776,10 23,9.775999 23,9.5 C 23,9.224001 22.776,9 22.5,9 z M 24.5,9 C 24.224,9 23.999999,9.224001 24,9.5 C 24,9.775999 24.223999,10 24.5,10 C 24.776,10 25,9.775999 25,9.5 C 25,9.224001 24.776,9 24.5,9 z M 26.5,9 C 26.224,9 25.999999,9.224001 26,9.5 C 26,9.775999 26.223999,10 26.5,10 C 26.776,10 27,9.775999 27,9.5 C 27,9.224001 26.776,9 26.5,9 z M 28.5,9 C 28.224,9 27.999999,9.224001 28,9.5 C 28,9.775999 28.223999,10 28.5,10 C 28.776,10 29,9.775999 29,9.5 C 29,9.224001 28.776,9 28.5,9 z M 30.5,9 C 30.224,9 30,9.224 30,9.5 C 30,9.776 30.224,10 30.5,10 C 30.776,10 31,9.776 31,9.5 C 31,9.224 30.776,9 30.5,9 z M 19.5,10 C 19.224,10 18.999999,10.224001 19,10.5 C 19,10.775999 19.223999,11 19.5,11 C 19.776,11 20,10.775999 20,10.5 C 20,10.224001 19.776,10 19.5,10 z M 21.5,10 C 21.224,10 20.999999,10.224001 21,10.5 C 21,10.775999 21.223999,11 21.5,11 C 21.776,11 22,10.775999 22,10.5 C 22,10.224001 21.776,10 21.5,10 z M 23.5,10 C 23.224,10 22.999999,10.224001 23,10.5 C 23,10.775999 23.223999,11 23.5,11 C 23.776,11 24,10.775999 24,10.5 C 24,10.224001 23.776,10 23.5,10 z M 25.5,10 C 25.224,10 24.999999,10.224001 25,10.5 C 25,10.775999 25.223999,11 25.5,11 C 25.776,11 26,10.775999 26,10.5 C 26,10.224001 25.776,10 25.5,10 z M 27.5,10 C 27.224,10 26.999999,10.224001 27,10.5 C 27,10.775999 27.223999,11 27.5,11 C 27.776,11 28,10.775999 28,10.5 C 28,10.224001 27.776,10 27.5,10 z M 29.5,10 C 29.224,10 28.999999,10.224001 29,10.5 C 29,10.775999 29.223999,11 29.5,11 C 29.776,11 30,10.775999 30,10.5 C 30,10.224001 29.776,10 29.5,10 z M 18.5,11 C 18.224,11 17.999999,11.224 18,11.5 C 18,11.775999 18.223999,12 18.5,12 C 18.776,12 19,11.775999 19,11.5 C 19,11.224001 18.776,11 18.5,11 z M 20.5,11 C 20.224,11 19.999999,11.224 20,11.5 C 20,11.775999 20.223999,12 20.5,12 C 20.776,12 21,11.775999 21,11.5 C 21,11.224001 20.776,11 20.5,11 z M 22.5,11 C 22.224,11 21.999999,11.224 22,11.5 C 22,11.775999 22.223999,12 22.5,12 C 22.776,12 23,11.775999 23,11.5 C 23,11.224001 22.776,11 22.5,11 z M 24.5,11 C 24.224,11 23.999999,11.224 24,11.5 C 24,11.775999 24.223999,12 24.5,12 C 24.776,12 25,11.775999 25,11.5 C 25,11.224001 24.776,11 24.5,11 z M 26.5,11 C 26.224,11 25.999999,11.224 26,11.5 C 26,11.775999 26.223999,12 26.5,12 C 26.776,12 27,11.775999 27,11.5 C 27,11.224001 26.776,11 26.5,11 z M 28.5,11 C 28.224,11 27.999999,11.224 28,11.5 C 28,11.775999 28.223999,12 28.5,12 C 28.776,12 29,11.775999 29,11.5 C 29,11.224001 28.776,11 28.5,11 z M 30.5,11 C 30.224,11 30,11.224 30,11.5 C 30,11.776 30.224,12 30.5,12 C 30.776,12 31,11.776 31,11.5 C 31,11.224 30.776,11 30.5,11 z M 19.5,12 C 19.224,12 18.999999,12.224 19,12.5 C 19,12.775999 19.223999,13 19.5,13 C 19.776,13 20,12.775999 20,12.5 C 20,12.224001 19.776,12 19.5,12 z M 21.5,12 C 21.224,12 20.999999,12.224 21,12.5 C 21,12.775999 21.223999,13 21.5,13 C 21.776,13 22,12.775999 22,12.5 C 22,12.224001 21.776,12 21.5,12 z M 23.5,12 C 23.224,12 22.999999,12.224 23,12.5 C 23,12.775999 23.223999,13 23.5,13 C 23.776,13 24,12.775999 24,12.5 C 24,12.224001 23.776,12 23.5,12 z M 25.5,12 C 25.224,12 24.999999,12.224 25,12.5 C 25,12.775999 25.223999,13 25.5,13 C 25.776,13 26,12.775999 26,12.5 C 26,12.224001 25.776,12 25.5,12 z M 27.5,12 C 27.224,12 26.999999,12.224 27,12.5 C 27,12.775999 27.223999,13 27.5,13 C 27.776,13 28,12.775999 28,12.5 C 28,12.224001 27.776,12 27.5,12 z M 29.5,12 C 29.224,12 28.999999,12.224 29,12.5 C 29,12.775999 29.223999,13 29.5,13 C 29.776,13 30,12.775999 30,12.5 C 30,12.224001 29.776,12 29.5,12 z M 18.5,13 C 18.224,13 17.999999,13.224 18,13.5 C 18,13.775999 18.223999,14 18.5,14 C 18.776,14 19,13.775999 19,13.5 C 19,13.224001 18.776,13 18.5,13 z M 20.5,13 C 20.224,13 19.999999,13.224 20,13.5 C 20,13.775999 20.223999,14 20.5,14 C 20.776,14 21,13.775999 21,13.5 C 21,13.224001 20.776,13 20.5,13 z M 22.5,13 C 22.224,13 21.999999,13.224 22,13.5 C 22,13.775999 22.223999,14 22.5,14 C 22.776,14 23,13.775999 23,13.5 C 23,13.224001 22.776,13 22.5,13 z M 24.5,13 C 24.224,13 23.999999,13.224 24,13.5 C 24,13.775999 24.223999,14 24.5,14 C 24.776,14 25,13.775999 25,13.5 C 25,13.224001 24.776,13 24.5,13 z M 26.5,13 C 26.224,13 25.999999,13.224 26,13.5 C 26,13.775999 26.223999,14 26.5,14 C 26.776,14 27,13.775999 27,13.5 C 27,13.224001 26.776,13 26.5,13 z M 28.5,13 C 28.224,13 27.999999,13.224 28,13.5 C 28,13.775999 28.223999,14 28.5,14 C 28.776,14 29,13.775999 29,13.5 C 29,13.224001 28.776,13 28.5,13 z M 30.5,13 C 30.224,13 30,13.224 30,13.5 C 30,13.776 30.224,14 30.5,14 C 30.776,14 31,13.776 31,13.5 C 31,13.224 30.776,13 30.5,13 z M 19.5,14 C 19.224,14 18.999999,14.224 19,14.5 C 19,14.775999 19.223999,15 19.5,15 C 19.776,15 20,14.775999 20,14.5 C 20,14.224001 19.776,14 19.5,14 z M 21.5,14 C 21.224,14 20.999999,14.224 21,14.5 C 21,14.775999 21.223999,15 21.5,15 C 21.776,15 22,14.775999 22,14.5 C 22,14.224001 21.776,14 21.5,14 z M 23.5,14 C 23.224,14 22.999999,14.224 23,14.5 C 23,14.775999 23.223999,15 23.5,15 C 23.776,15 24,14.775999 24,14.5 C 24,14.224001 23.776,14 23.5,14 z M 25.5,14 C 25.224,14 24.999999,14.224 25,14.5 C 25,14.775999 25.223999,15 25.5,15 C 25.776,15 26,14.775999 26,14.5 C 26,14.224001 25.776,14 25.5,14 z M 27.5,14 C 27.224,14 26.999999,14.224 27,14.5 C 27,14.775999 27.223999,15 27.5,15 C 27.776,15 28,14.775999 28,14.5 C 28,14.224001 27.776,14 27.5,14 z M 29.5,14 C 29.224,14 28.999999,14.224 29,14.5 C 29,14.775999 29.223999,15 29.5,15 C 29.776,15 30,14.775999 30,14.5 C 30,14.224001 29.776,14 29.5,14 z M 18.5,15 C 18.224,15 17.999999,15.224 18,15.5 C 18,15.775999 18.223999,16 18.5,16 C 18.776,16 19,15.775999 19,15.5 C 19,15.224001 18.776,15 18.5,15 z M 20.5,15 C 20.224,15 19.999999,15.224 20,15.5 C 20,15.775999 20.223999,16 20.5,16 C 20.776,16 21,15.775999 21,15.5 C 21,15.224001 20.776,15 20.5,15 z M 22.5,15 C 22.224,15 21.999999,15.224 22,15.5 C 22,15.775999 22.223999,16 22.5,16 C 22.776,16 23,15.775999 23,15.5 C 23,15.224001 22.776,15 22.5,15 z M 24.5,15 C 24.224,15 23.999999,15.224 24,15.5 C 24,15.775999 24.223999,16 24.5,16 C 24.776,16 25,15.775999 25,15.5 C 25,15.224001 24.776,15 24.5,15 z M 26.5,15 C 26.224,15 25.999999,15.224 26,15.5 C 26,15.775999 26.223999,16 26.5,16 C 26.776,16 27,15.775999 27,15.5 C 27,15.224001 26.776,15 26.5,15 z M 28.5,15 C 28.224,15 27.999999,15.224 28,15.5 C 28,15.775999 28.223999,16 28.5,16 C 28.776,16 29,15.775999 29,15.5 C 29,15.224001 28.776,15 28.5,15 z M 30.5,15 C 30.224,15 30,15.224 30,15.5 C 30,15.776 30.224,16 30.5,16 C 30.776,16 31,15.776 31,15.5 C 31,15.224 30.776,15 30.5,15 z M 19.5,16 C 19.224,16 18.999999,16.224001 19,16.5 C 19,16.775999 19.223999,17 19.5,17 C 19.776,17 20,16.776 20,16.5 C 20,16.224001 19.776,16 19.5,16 z M 21.5,16 C 21.224,16 20.999999,16.224001 21,16.5 C 21,16.775999 21.223999,17 21.5,17 C 21.776,17 22,16.776 22,16.5 C 22,16.224001 21.776,16 21.5,16 z M 23.5,16 C 23.224,16 22.999999,16.224001 23,16.5 C 23,16.775999 23.223999,17 23.5,17 C 23.776,17 24,16.776 24,16.5 C 24,16.224001 23.776,16 23.5,16 z M 25.5,16 C 25.224,16 24.999999,16.224001 25,16.5 C 25,16.775999 25.223999,17 25.5,17 C 25.776,17 26,16.776 26,16.5 C 26,16.224001 25.776,16 25.5,16 z M 27.5,16 C 27.224,16 26.999999,16.224001 27,16.5 C 27,16.775999 27.223999,17 27.5,17 C 27.776,17 28,16.776 28,16.5 C 28,16.224001 27.776,16 27.5,16 z M 29.5,16 C 29.224,16 28.999999,16.224 29,16.5 C 29,16.775999 29.223999,17 29.5,17 C 29.776,17 30,16.775999 30,16.5 C 30,16.224001 29.776,16 29.5,16 z M 18.5,17 C 18.224,17 17.999999,17.224001 18,17.5 C 18,17.775999 18.223999,18 18.5,18 C 18.776,18 19,17.776 19,17.5 C 19,17.224001 18.776,17 18.5,17 z M 20.5,17 C 20.224,17 19.999999,17.224001 20,17.5 C 20,17.775999 20.223999,18 20.5,18 C 20.776,18 21,17.776 21,17.5 C 21,17.224001 20.776,17 20.5,17 z M 22.5,17 C 22.224,17 21.999999,17.224001 22,17.5 C 22,17.775999 22.223999,18 22.5,18 C 22.776,18 23,17.776 23,17.5 C 23,17.224001 22.776,17 22.5,17 z M 24.5,17 C 24.224,17 23.999999,17.224001 24,17.5 C 24,17.775999 24.223999,18 24.5,18 C 24.776,18 25,17.776 25,17.5 C 25,17.224001 24.776,17 24.5,17 z M 26.5,17 C 26.224,17 25.999999,17.224001 26,17.5 C 26,17.775999 26.223999,18 26.5,18 C 26.776,18 27,17.776 27,17.5 C 27,17.224001 26.776,17 26.5,17 z M 28.5,17 C 28.224,17 27.999999,17.224001 28,17.5 C 28,17.775999 28.223999,18 28.5,18 C 28.776,18 29,17.776 29,17.5 C 29,17.224001 28.776,17 28.5,17 z M 30.5,17 C 30.224,17 30,17.224 30,17.5 C 30,17.776 30.224,18 30.5,18 C 30.776,18 31,17.776 31,17.5 C 31,17.224 30.776,17 30.5,17 z M 19.5,18 C 19.224,18 18.999999,18.224001 19,18.5 C 19,18.775999 19.223999,19 19.5,19 C 19.776,19 20,18.776 20,18.5 C 20,18.224001 19.776,18 19.5,18 z M 21.5,18 C 21.224,18 20.999999,18.224001 21,18.5 C 21,18.775999 21.223999,19 21.5,19 C 21.776,19 22,18.776 22,18.5 C 22,18.224001 21.776,18 21.5,18 z M 23.5,18 C 23.224,18 22.999999,18.224001 23,18.5 C 23,18.775999 23.223999,19 23.5,19 C 23.776,19 24,18.776 24,18.5 C 24,18.224001 23.776,18 23.5,18 z M 25.5,18 C 25.224,18 24.999999,18.224001 25,18.5 C 25,18.775999 25.223999,19 25.5,19 C 25.776,19 26,18.776 26,18.5 C 26,18.224001 25.776,18 25.5,18 z M 27.5,18 C 27.224,18 26.999999,18.224001 27,18.5 C 27,18.775999 27.223999,19 27.5,19 C 27.776,19 28,18.776 28,18.5 C 28,18.224001 27.776,18 27.5,18 z M 29.5,18 C 29.224,18 28.999999,18.224001 29,18.5 C 29,18.775999 29.223999,19 29.5,19 C 29.776,19 30,18.776 30,18.5 C 30,18.224001 29.776,18 29.5,18 z M 18.5,19 C 18.224,19 17.999999,19.224001 18,19.5 C 18,19.775999 18.223999,19.999999 18.5,20 C 18.776,20 19,19.776 19,19.5 C 19,19.224001 18.776,19 18.5,19 z M 20.5,19 C 20.224,19 19.999999,19.224001 20,19.5 C 20,19.775999 20.223999,19.999999 20.5,20 C 20.776,20 21,19.776 21,19.5 C 21,19.224001 20.776,19 20.5,19 z M 22.5,19 C 22.224,19 21.999999,19.224001 22,19.5 C 22,19.775999 22.223999,19.999999 22.5,20 C 22.776,20 23,19.776 23,19.5 C 23,19.224001 22.776,19 22.5,19 z M 24.5,19 C 24.224,19 23.999999,19.224001 24,19.5 C 24,19.775999 24.223999,19.999999 24.5,20 C 24.776,20 25,19.776 25,19.5 C 25,19.224001 24.776,19 24.5,19 z M 26.5,19 C 26.224,19 25.999999,19.224001 26,19.5 C 26,19.775999 26.223999,19.999999 26.5,20 C 26.776,20 27,19.776 27,19.5 C 27,19.224001 26.776,19 26.5,19 z M 28.5,19 C 28.224,19 27.999999,19.224001 28,19.5 C 28,19.775999 28.223999,19.999999 28.5,20 C 28.776,20 29,19.776 29,19.5 C 29,19.224001 28.776,19 28.5,19 z M 30.5,19 C 30.224,19 30,19.224 30,19.5 C 30,19.776 30.224,20 30.5,20 C 30.776,20 31,19.776 31,19.5 C 31,19.224 30.776,19 30.5,19 z M 19.5,20 C 19.224,20 18.999999,20.224001 19,20.5 C 19,20.775999 19.223999,20.999999 19.5,21 C 19.776,21 20,20.776 20,20.5 C 20,20.224001 19.776,20 19.5,20 z M 21.5,20 C 21.224,20 20.999999,20.224001 21,20.5 C 21,20.775999 21.223999,20.999999 21.5,21 C 21.776,21 22,20.776 22,20.5 C 22,20.224001 21.776,20 21.5,20 z M 23.5,20 C 23.224,20 22.999999,20.224001 23,20.5 C 23,20.775999 23.223999,20.999999 23.5,21 C 23.776,21 24,20.776 24,20.5 C 24,20.224001 23.776,20 23.5,20 z M 25.5,20 C 25.224,20 24.999999,20.224001 25,20.5 C 25,20.775999 25.223999,20.999999 25.5,21 C 25.776,21 26,20.776 26,20.5 C 26,20.224001 25.776,20 25.5,20 z M 27.5,20 C 27.224,20 26.999999,20.224001 27,20.5 C 27,20.775999 27.223999,20.999999 27.5,21 C 27.776,21 28,20.776 28,20.5 C 28,20.224001 27.776,20 27.5,20 z M 29.5,20 C 29.224,20 28.999999,20.224001 29,20.5 C 29,20.775999 29.223999,20.999999 29.5,21 C 29.776,21 30,20.776 30,20.5 C 30,20.224001 29.776,20 29.5,20 z M 20.5,21 C 20.224,21 19.999999,21.224001 20,21.5 C 20,21.775999 20.223999,21.999999 20.5,22 C 20.776,22 21,21.776 21,21.5 C 21,21.224001 20.776,21 20.5,21 z M 22.5,21 C 22.224,21 21.999999,21.224001 22,21.5 C 22,21.775999 22.223999,21.999999 22.5,22 C 22.776,22 23,21.776 23,21.5 C 23,21.224001 22.776,21 22.5,21 z M 24.5,21 C 24.224,21 23.999999,21.224001 24,21.5 C 24,21.775999 24.223999,21.999999 24.5,22 C 24.776,22 25,21.776 25,21.5 C 25,21.224001 24.776,21 24.5,21 z M 26.5,21 C 26.224,21 25.999999,21.224001 26,21.5 C 26,21.775999 26.223999,21.999999 26.5,22 C 26.776,22 27,21.776 27,21.5 C 27,21.224001 26.776,21 26.5,21 z M 28.5,21 C 28.224,21 27.999999,21.224001 28,21.5 C 28,21.775999 28.223999,21.999999 28.5,22 C 28.776,22 29,21.776 29,21.5 C 29,21.224001 28.776,21 28.5,21 z M 21.5,22 C 21.224,22 20.999999,22.224001 21,22.5 C 21,22.775999 21.223999,22.999999 21.5,23 C 21.776,23 22,22.776 22,22.5 C 22,22.224001 21.776,22 21.5,22 z M 23.5,22 C 23.224,22 22.999999,22.224001 23,22.5 C 23,22.775999 23.223999,22.999999 23.5,23 C 23.776,23 24,22.776 24,22.5 C 24,22.224001 23.776,22 23.5,22 z M 25.5,22 C 25.224,22 24.999999,22.224001 25,22.5 C 25,22.775999 25.223999,22.999999 25.5,23 C 25.776,23 26,22.776 26,22.5 C 26,22.224001 25.776,22 25.5,22 z M 27.5,22 C 27.224,22 26.999999,22.224001 27,22.5 C 27,22.775999 27.223999,22.999999 27.5,23 C 27.776,23 28,22.776 28,22.5 C 28,22.224001 27.776,22 27.5,22 z M 22.5,23 C 22.224,23 21.999999,23.224001 22,23.5 C 22,23.775999 22.223999,23.999999 22.5,24 C 22.776,24 23,23.776 23,23.5 C 23,23.224001 22.776,23 22.5,23 z M 24.5,23 C 24.224,23 23.999999,23.224001 24,23.5 C 24,23.775999 24.223999,23.999999 24.5,24 C 24.776,24 25,23.776 25,23.5 C 25,23.224001 24.776,23 24.5,23 z M 26.5,23 C 26.224,23 25.999999,23.224001 26,23.5 C 26,23.775999 26.223999,23.999999 26.5,24 C 26.776,24 27,23.776 27,23.5 C 27,23.224001 26.776,23 26.5,23 z M 23.5,24 C 23.224,24 22.999999,24.224001 23,24.5 C 23,24.775999 23.223999,24.999999 23.5,25 C 23.776,25 24,24.776 24,24.5 C 24,24.224001 23.776,24 23.5,24 z M 25.5,24 C 25.224,24 24.999999,24.224001 25,24.5 C 25,24.775999 25.223999,24.999999 25.5,25 C 25.776,25 26,24.776 26,24.5 C 26,24.224001 25.776,24 25.5,24 z"
-         style="opacity:0.5;fill:url(#linearGradient3064);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="6.0500031"
-         rx="6.0000024"
-         y="2.5000026"
-         x="18.500008"
-         height="22.000008"
-         width="12.000005"
-         id="rect2967"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3066);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:#729fcf;display:inline"
-       id="g27916"
-       transform="matrix(0.3975228,0,0,0.9423324,-18.689059,-4.6737794)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path21632"
-         d="M 67.5625,34.78125 C 71.176369,31.899733 73.499999,27.47788 73.5,22.5 C 73.5,17.793936 71.43603,13.569699 68.15625,10.6875"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3375);stroke-width:1.25757563;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       style="stroke:#729fcf;display:inline"
-       id="g28807"
-       transform="matrix(0.272091,0,0,0.9423324,-15.475768,-4.3498543)">
-      <path
-         sodipodi:nodetypes="csc"
-         id="path27920"
-         d="M 74.954806,30.15625 C 77.22438,28.375887 78.673556,25.606103 78.673556,22.5 C 78.673556,19.560794 77.36198,16.939552 75.298556,15.15625"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3377);stroke-width:1.52005064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-muted.svg b/mate-volume-control/data/icons/scalable/status/audio-input-microphone-muted.svg
deleted file mode 100644
index 962b4de..0000000
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-muted.svg
+++ /dev/null
@@ -1,1040 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2790"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="audio-input-mic-muted.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2792">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient6964"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient6958">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop6960" />
-      <stop
-         id="stop6966"
-         offset="0.60000002"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0;"
-         offset="1"
-         id="stop6962" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3579">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3581" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3583" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient3585"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)" />
-    <linearGradient
-       id="linearGradient3228">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3230" />
-      <stop
-         id="stop3573"
-         offset="0.06770357"
-         style="stop-color:black;stop-opacity:0.42857143;" />
-      <stop
-         id="stop3569"
-         offset="0.29894069"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         style="stop-color:black;stop-opacity:0.49803922;"
-         offset="0.77437174"
-         id="stop3571" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient3567"
-       gradientUnits="userSpaceOnUse"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399"
-       gradientTransform="translate(0,3)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2920">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2922" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2924" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient2926"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2877">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2879" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2881" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient2894"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3815">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2892"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2867">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2869" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2871" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient2890"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       id="linearGradient3734">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3736" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3738" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient3740"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient4481">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4483" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop4485" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient4487"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2904">
-      <stop
-         id="stop2906"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0.21551724"
-         id="stop2910" />
-      <stop
-         id="stop2912"
-         offset="0.70243758"
-         style="stop-color:#c3c4c2;stop-opacity:1;" />
-      <stop
-         id="stop2908"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient2902"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2949"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2943">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop2945" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop2947" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033"
-       gradientTransform="translate(14,0)" />
-    <linearGradient
-       id="linearGradient2981">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2983" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop2985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient2987"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientTransform="translate(20,-1)" />
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       id="linearGradient3726">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3728" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop3730" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient3732"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3703">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3705" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3707" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient3709"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3779">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop3781" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop3783" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3785"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2965">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:0;"
-         offset="1"
-         id="stop2969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient2971"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3711"
-       inkscape:collect="always">
-      <stop
-         id="stop3713"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1" />
-      <stop
-         id="stop3715"
-         offset="1"
-         style="stop-color:#888a85;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient3691"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4465">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="0"
-         id="stop4467" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0"
-         offset="1"
-         id="stop4469" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4465"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942"
-       gradientTransform="translate(-0.25,12.5)" />
-    <linearGradient
-       id="linearGradient4475"
-       inkscape:collect="always">
-      <stop
-         id="stop4477"
-         offset="0"
-         style="stop-color:black;stop-opacity:1" />
-      <stop
-         id="stop4479"
-         offset="1"
-         style="stop-color:black;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4475"
-       id="linearGradient4473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.25,13.5)"
-       x1="32.864544"
-       y1="13.794194"
-       x2="32.864544"
-       y2="5.5441942" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient4505"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4499">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop4501" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop4503" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient3012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2798" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6999424,0,0,3.5713875,-122.46854,-58.740132)"
-       cx="72.495682"
-       cy="22.84375"
-       fx="72.495682"
-       fy="22.84375"
-       r="4.8202302" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8087117,0,0,3.5234273,-57.039447,-57.368542)"
-       cx="70.53125"
-       cy="22.734375"
-       fx="70.53125"
-       fy="22.734375"
-       r="3.5975378" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6958"
-       id="radialGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1454532,0,0,3.0191635,-69.461,-45.746674)"
-       cx="60.640625"
-       cy="22.65625"
-       fx="60.640625"
-       fy="22.65625"
-       r="2.6194003" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4499"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3711"
-       id="radialGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.106546,0,0,0.58328,-1.909343,15.04719)"
-       cx="18.753521"
-       cy="40.578671"
-       fx="18.753521"
-       fy="40.578671"
-       r="13.08399" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2965"
-       id="radialGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.508772,0,18.12988)"
-       cx="23.82066"
-       cy="36.907261"
-       fx="23.82066"
-       fy="36.907261"
-       r="12.59534" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.980843,0,0,0.974547,0.59387,-0.156861)"
-       x1="23.997437"
-       y1="37.835339"
-       x2="29.74268"
-       y2="32.355263" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3703"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       x1="23.8125"
-       y1="41.836731"
-       x2="27.272261"
-       y2="28.590008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3726"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="25.606806"
-       y1="36.722809"
-       x2="23.640165"
-       y2="30.421146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient2551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,-1)"
-       x1="13.567612"
-       y1="18.432873"
-       x2="13.567612"
-       y2="19.231655" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2981"
-       id="linearGradient2553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.940947,0,1.564893)"
-       x1="23.374121"
-       y1="19.452076"
-       x2="21.649811"
-       y2="25.229111" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(14,0)"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2943"
-       id="linearGradient2557"
-       gradientUnits="userSpaceOnUse"
-       x1="16.65625"
-       y1="16.14632"
-       x2="16.65625"
-       y2="20.381033" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2904"
-       id="linearGradient2559"
-       gradientUnits="userSpaceOnUse"
-       x1="18.737373"
-       y1="13.351768"
-       x2="30.230837"
-       y2="13.351768" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4481"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       x1="17.625"
-       y1="20.814491"
-       x2="17.625"
-       y2="5.125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)"
-       x1="24.6875"
-       y1="36.75"
-       x2="24.6875"
-       y2="28.617105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867"
-       id="linearGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.809211,0,2.763158)"
-       x1="19.583334"
-       y1="10.76408"
-       x2="23.176371"
-       y2="10.76408" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2567"
-       gradientUnits="userSpaceOnUse"
-       x1="23.246162"
-       y1="24.761473"
-       x2="23.246162"
-       y2="15.94703" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2877"
-       id="linearGradient2569"
-       gradientUnits="userSpaceOnUse"
-       x1="21.961548"
-       y1="6.3608937"
-       x2="24.508121"
-       y2="10.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2920"
-       id="radialGradient2571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.580773,0,0,0.961547,-12.77702,-2.531609)"
-       cx="22.553526"
-       cy="10.432782"
-       fx="22.553526"
-       fy="10.432782"
-       r="6.46875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3228"
-       id="linearGradient2573"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3)"
-       x1="17.999674"
-       y1="10.081399"
-       x2="30"
-       y2="10.081399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3579"
-       id="linearGradient2575"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.09091,0,0,1.100001,-1.681827,0.84999)"
-       x1="20.483149"
-       y1="3.4711361"
-       x2="28.357954"
-       y2="25.991137" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.270833"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="780"
-     inkscape:window-height="776"
-     inkscape:window-x="949"
-     inkscape:window-y="190" />
-  <metadata
-     id="metadata2795">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g2915"
-       transform="translate(7.6012894,0.1428571)">
-      <path
-         transform="matrix(0.727673,0,0,1.235135,7.166344,-12.0556)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2917"
-         style="opacity:0.1;fill:url(#radialGradient2535);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.233813,0,0,1.235135,-4.890235,-6.055598)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2919"
-         style="opacity:0.7;fill:url(#radialGradient2537);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2925"
-         style="opacity:1;fill:url(#radialGradient2539);fill-opacity:1;stroke:#555753;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.43667,0,0,0.429141,14.09824,21.41158)"
-         d="M 36.415999,36.907261 A 12.59534,6.4081554 0 1 1 11.22532,36.907261 A 12.59534,6.4081554 0 1 1 36.415999,36.907261 z"
-         sodipodi:ry="6.4081554"
-         sodipodi:rx="12.59534"
-         sodipodi:cy="36.907261"
-         sodipodi:cx="23.82066"
-         id="path2927"
-         style="opacity:1;fill:url(#radialGradient2541);fill-opacity:1;stroke:none;stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccssccc"
-         id="path2929"
-         d="M 27.35249,32.125 C 25.613836,32.860383 24.806671,34.177948 23.67433,35.292277 C 23.188021,35.599877 23.07463,36.001723 23.15468,36.568962 C 23.23473,37.136205 23.644126,37.624296 24.196826,37.787146 C 24.749524,37.949994 25.196373,37.917185 25.574713,37.485007 C 26.676195,35.285524 28.744563,33.983863 31,32.85591 C 29.870496,32.536987 28.651039,32.264053 27.35249,32.125 z"
-         style="opacity:0.7;fill:url(#linearGradient2543);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.032128,0,0,1.014402,-8.596444e-2,1.56074)"
-         d="M 23.8125,31.5 C 20.473005,31.5 17.440949,32.183256 15.34375,33.25 C 13.246551,34.316744 12.21875,35.666366 12.21875,36.90625 C 12.21875,38.146134 13.246551,39.495756 15.34375,40.5625 C 17.440949,41.629244 20.473005,42.312501 23.8125,42.3125 C 27.151995,42.3125 30.184051,41.629244 32.28125,40.5625 C 34.378449,39.495756 35.40625,38.146134 35.40625,36.90625 C 35.40625,35.666366 34.378449,34.316744 32.28125,33.25 C 30.184051,32.183256 27.151995,31.5 23.8125,31.5 z"
-         id="path2931"
-         style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient2545);stroke-width:0.97730058;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         inkscape:original="M 23.8125 30.5 C 16.859872 30.5 11.21875 33.368948 11.21875 36.90625 C 11.21875 40.443552 16.859872 43.312502 23.8125 43.3125 C 30.765128 43.3125 36.406249 40.443552 36.40625 36.90625 C 36.40625 33.368948 30.765128 30.5 23.8125 30.5 z "
-         inkscape:radius="-0.99470079"
-         sodipodi:type="inkscape:offset" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2933"
-         d="M 24.5,27.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2547);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2935"
-         d="M 34.500008,18.999997 C 34.5,23.285708 30.040008,26.499998 24.500006,26.499998 C 18.960004,26.499998 14.5,23.285708 14.500003,18.999997"
-         style="fill:none;fill-opacity:1;stroke:#888a85;stroke-width:3.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="12.5"
-         height="2.9999995"
-         width="4"
-         id="rect2937"
-         style="opacity:1;fill:url(#linearGradient2549);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         y="16.499998"
-         x="32.5"
-         height="2.9999995"
-         width="4"
-         id="rect2939"
-         style="opacity:1;fill:url(#linearGradient2551);fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="csc"
-         id="path2941"
-         d="M 34.500008,18.999991 C 34.500008,23.285701 30.040008,26.499992 24.500006,26.499992 C 18.960004,26.499992 14.5,23.285701 14.500003,18.999991"
-         style="fill:none;fill-opacity:1;stroke:url(#linearGradient2553);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="30"
-         height="6"
-         width="3.0000005"
-         id="rect2943"
-         style="opacity:1;fill:url(#linearGradient2555);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,12.25,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2945"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <rect
-         ry="0.9722718"
-         rx="0.9722718"
-         y="15"
-         x="16"
-         height="6"
-         width="3.0000005"
-         id="rect2947"
-         style="opacity:1;fill:url(#linearGradient2557);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="7.0108709"
-         rx="7.0000019"
-         y="1.5000002"
-         x="17.499996"
-         height="24.000008"
-         width="14.000004"
-         id="rect2949"
-         style="opacity:1;fill:url(#linearGradient2559);fill-opacity:1;stroke:url(#linearGradient2561);stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path2951"
-         d="M 24.5,26.5 L 24.5,36.5"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2563);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         transform="matrix(1.5,0,0,1.5,-7.75,-11.25)"
-         d="M 14.5,19 A 0.5,0.5 0 1 1 13.5,19 A 0.5,0.5 0 1 1 14.5,19 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="19"
-         sodipodi:cx="14"
-         id="path2953"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         sodipodi:type="arc" />
-      <g
-         id="g2955"
-         style="display:inline">
-        <rect
-           style="opacity:1;fill:url(#linearGradient2565);fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="rect2957"
-           width="4"
-           height="15.374996"
-           x="20"
-           y="6"
-           rx="2"
-           ry="2.1991496" />
-        <path
-           sodipodi:type="inkscape:offset"
-           inkscape:radius="-0.54470092"
-           inkscape:original="M 24.5 2.5 C 20.621999 2.5 17.5 5.615977 17.5 9.5 L 17.5 19.5 C 17.5 23.384022 20.621999 26.5 24.5 26.5 C 28.378001 26.5 31.5 23.384022 31.5 19.5 L 31.5 9.5 C 31.5 5.6159775 28.378001 2.5 24.5 2.5 z "
-           style="opacity:0.2;fill:url(#linearGradient2567);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-           id="path2959"
-           d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,19.5 C 18.03125,23.092133 20.913778,25.96875 24.5,25.96875 C 28.086222,25.96875 30.96875,23.092133 30.96875,19.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-           transform="translate(0,-1)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:url(#linearGradient2569);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path2961"
-           sodipodi:cx="23.65625"
-           sodipodi:cy="7.6875"
-           sodipodi:rx="3.34375"
-           sodipodi:ry="3.0625"
-           d="M 27,7.6875 A 3.34375,3.0625 0 1 1 20.3125,7.6875 A 3.34375,3.0625 0 1 1 27,7.6875 z"
-           transform="matrix(1,0,0,1.081633,-0.375,-1.252551)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path2963"
-         d="M 24.5,3.03125 C 20.913777,3.03125 18.03125,5.9078661 18.03125,9.5 L 18.03125,14.5 L 30.96875,14.5 L 30.96875,9.5 C 30.96875,5.9078666 28.086223,3.03125 24.5,3.03125 z"
-         style="opacity:0.9;fill:url(#radialGradient2571);fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         transform="translate(0,-1)" />
-      <path
-         sodipodi:nodetypes="csssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssc"
-         id="path2965"
-         d="M 22.5,3 C 22.224,3 22,3.224 22,3.5 C 22,3.776 22.224,4 22.5,4 C 22.776,4 23,3.776 23,3.5 C 23,3.224 22.776,3 22.5,3 z M 24.5,3 C 24.224,3 24,3.224 24,3.5 C 24,3.776 24.224,4 24.5,4 C 24.776,4 25,3.776 25,3.5 C 25,3.224 24.776,3 24.5,3 z M 26.5,3 C 26.224,3 26,3.224 26,3.5 C 26,3.776 26.224,4 26.5,4 C 26.776,4 27,3.776 27,3.5 C 27,3.224 26.776,3 26.5,3 z M 21.5,4 C 21.224,4 21,4.224 21,4.5 C 21,4.776 21.224,5 21.5,5 C 21.776,5 22,4.776 22,4.5 C 22,4.224 21.776,4 21.5,4 z M 23.5,4 C 23.224,4 22.999999,4.2240007 23,4.5 C 23,4.7759993 23.223999,5 23.5,5 C 23.776,5 24,4.7759993 24,4.5 C 24,4.2240007 23.776,4 23.5,4 z M 25.5,4 C 25.224,4 24.999999,4.2240007 25,4.5 C 25,4.7759993 25.223999,5 25.5,5 C 25.776,5 26,4.7759993 26,4.5 C 26,4.2240007 25.776,4 25.5,4 z M 27.5,4 C 27.224,4 27,4.224 27,4.5 C 27,4.776 27.224,5 27.5,5 C 27.776,5 28,4.776 28,4.5 C 28,4.224 27.776,4 27.5,4 z M 20.5,5 C 20.224,5 19.999999,5.2240008 20,5.5 C 20,5.7759993 20.223999,6 20.5,6 C 20.776,6 21,5.7759994 21,5.5 C 21,5.2240007 20.776,5 20.5,5 z M 22.5,5 C 22.224,5 21.999999,5.2240008 22,5.5 C 22,5.7759993 22.223999,6 22.5,6 C 22.776,6 23,5.7759994 23,5.5 C 23,5.2240007 22.776,5 22.5,5 z M 24.5,5 C 24.224,5 23.999999,5.2240008 24,5.5 C 24,5.7759993 24.223999,6 24.5,6 C 24.776,6 25,5.7759994 25,5.5 C 25,5.2240007 24.776,5 24.5,5 z M 26.5,5 C 26.224,5 25.999999,5.2240008 26,5.5 C 26,5.7759993 26.223999,6 26.5,6 C 26.776,6 27,5.7759994 27,5.5 C 27,5.2240007 26.776,5 26.5,5 z M 28.5,5 C 28.224,5 28,5.224 28,5.5 C 28,5.776 28.224,6 28.5,6 C 28.776,6 29,5.776 29,5.5 C 29,5.224 28.776,5 28.5,5 z M 19.5,6 C 19.224,6 18.999999,6.2240008 19,6.5 C 19,6.7759993 19.223999,7 19.5,7 C 19.776,7 20,6.7759994 20,6.5 C 20,6.2240007 19.776,6 19.5,6 z M 21.5,6 C 21.224,6 20.999999,6.2240008 21,6.5 C 21,6.7759993 21.223999,7 21.5,7 C 21.776,7 22,6.7759994 22,6.5 C 22,6.2240007 21.776,6 21.5,6 z M 23.5,6 C 23.224,6 22.999999,6.2240008 23,6.5 C 23,6.7759993 23.223999,7 23.5,7 C 23.776,7 24,6.7759994 24,6.5 C 24,6.2240007 23.776,6 23.5,6 z M 25.5,6 C 25.224,6 24.999999,6.2240008 25,6.5 C 25,6.7759993 25.223999,7 25.5,7 C 25.776,7 26,6.7759994 26,6.5 C 26,6.2240007 25.776,6 25.5,6 z M 27.5,6 C 27.224,6 26.999999,6.2240008 27,6.5 C 27,6.7759993 27.223999,7 27.5,7 C 27.776,7 28,6.7759994 28,6.5 C 28,6.2240007 27.776,6 27.5,6 z M 29.5,6 C 29.224,6 29,6.224 29,6.5 C 29,6.776 29.224,7 29.5,7 C 29.776,7 30,6.776 30,6.5 C 30,6.224 29.776,6 29.5,6 z M 20.5,7 C 20.224,7 19.999999,7.2240008 20,7.5 C 20,7.7759993 20.223999,8.0000002 20.5,8 C 20.776,8 21,7.7759994 21,7.5 C 21,7.2240007 20.776,7 20.5,7 z M 22.5,7 C 22.224,7 21.999999,7.2240008 22,7.5 C 22,7.7759993 22.223999,8.0000002 22.5,8 C 22.776,8 23,7.7759994 23,7.5 C 23,7.2240007 22.776,7 22.5,7 z M 24.5,7 C 24.224,7 23.999999,7.2240008 24,7.5 C 24,7.7759993 24.223999,8.0000002 24.5,8 C 24.776,8 25,7.7759994 25,7.5 C 25,7.2240007 24.776,7 24.5,7 z M 26.5,7 C 26.224,7 25.999999,7.2240008 26,7.5 C 26,7.7759993 26.223999,8.0000002 26.5,8 C 26.776,8 27,7.7759994 27,7.5 C 27,7.2240007 26.776,7 26.5,7 z M 28.5,7 C 28.224,7 27.999999,7.2240008 28,7.5 C 28,7.7759993 28.223999,8.0000002 28.5,8 C 28.776,8 29,7.7759994 29,7.5 C 29,7.2240007 28.776,7 28.5,7 z M 30.5,7 C 30.224,7 30,7.224 30,7.5 C 30,7.776 30.224,8 30.5,8 C 30.776,8 31,7.776 31,7.5 C 31,7.224 30.776,7 30.5,7 z M 19.5,8 C 19.224,8 18.999999,8.2240008 19,8.5 C 19,8.7759993 19.223999,9 19.5,9 C 19.776,9 20,8.7759994 20,8.5 C 20,8.2240007 19.776,8 19.5,8 z M 21.5,8 C 21.224,8 20.999999,8.2240008 21,8.5 C 21,8.7759993 21.223999,9 21.5,9 C 21.776,9 22,8.7759994 22,8.5 C 22,8.2240007 21.776,8 21.5,8 z M 23.5,8 C 23.224,8 22.999999,8.2240008 23,8.5 C 23,8.7759993 23.223999,9 23.5,9 C 23.776,9 24,8.7759994 24,8.5 C 24,8.2240007 23.776,8 23.5,8 z M 25.5,8 C 25.224,8 24.999999,8.2240008 25,8.5 C 25,8.7759993 25.223999,9 25.5,9 C 25.776,9 26,8.7759994 26,8.5 C 26,8.2240007 25.776,8 25.5,8 z M 27.5,8 C 27.224,8 26.999999,8.2240008 27,8.5 C 27,8.7759993 27.223999,9 27.5,9 C 27.776,9 28,8.7759994 28,8.5 C 28,8.2240007 27.776,8 27.5,8 z M 29.5,8 C 29.224,8 28.999999,8.2240008 29,8.5 C 29,8.7759993 29.223999,9 29.5,9 C 29.776,9 30,8.7759994 30,8.5 C 30,8.2240007 29.776,8 29.5,8 z M 18.5,9 C 18.224,9 17.999999,9.224001 18,9.5 C 18,9.775999 18.223999,10 18.5,10 C 18.776,10 19,9.775999 19,9.5 C 19,9.224001 18.776,9 18.5,9 z M 20.5,9 C 20.224,9 19.999999,9.224001 20,9.5 C 20,9.775999 20.223999,10 20.5,10 C 20.776,10 21,9.775999 21,9.5 C 21,9.224001 20.776,9 20.5,9 z M 22.5,9 C 22.224,9 21.999999,9.224001 22,9.5 C 22,9.775999 22.223999,10 22.5,10 C 22.776,10 23,9.775999 23,9.5 C 23,9.224001 22.776,9 22.5,9 z M 24.5,9 C 24.224,9 23.999999,9.224001 24,9.5 C 24,9.775999 24.223999,10 24.5,10 C 24.776,10 25,9.775999 25,9.5 C 25,9.224001 24.776,9 24.5,9 z M 26.5,9 C 26.224,9 25.999999,9.224001 26,9.5 C 26,9.775999 26.223999,10 26.5,10 C 26.776,10 27,9.775999 27,9.5 C 27,9.224001 26.776,9 26.5,9 z M 28.5,9 C 28.224,9 27.999999,9.224001 28,9.5 C 28,9.775999 28.223999,10 28.5,10 C 28.776,10 29,9.775999 29,9.5 C 29,9.224001 28.776,9 28.5,9 z M 30.5,9 C 30.224,9 30,9.224 30,9.5 C 30,9.776 30.224,10 30.5,10 C 30.776,10 31,9.776 31,9.5 C 31,9.224 30.776,9 30.5,9 z M 19.5,10 C 19.224,10 18.999999,10.224001 19,10.5 C 19,10.775999 19.223999,11 19.5,11 C 19.776,11 20,10.775999 20,10.5 C 20,10.224001 19.776,10 19.5,10 z M 21.5,10 C 21.224,10 20.999999,10.224001 21,10.5 C 21,10.775999 21.223999,11 21.5,11 C 21.776,11 22,10.775999 22,10.5 C 22,10.224001 21.776,10 21.5,10 z M 23.5,10 C 23.224,10 22.999999,10.224001 23,10.5 C 23,10.775999 23.223999,11 23.5,11 C 23.776,11 24,10.775999 24,10.5 C 24,10.224001 23.776,10 23.5,10 z M 25.5,10 C 25.224,10 24.999999,10.224001 25,10.5 C 25,10.775999 25.223999,11 25.5,11 C 25.776,11 26,10.775999 26,10.5 C 26,10.224001 25.776,10 25.5,10 z M 27.5,10 C 27.224,10 26.999999,10.224001 27,10.5 C 27,10.775999 27.223999,11 27.5,11 C 27.776,11 28,10.775999 28,10.5 C 28,10.224001 27.776,10 27.5,10 z M 29.5,10 C 29.224,10 28.999999,10.224001 29,10.5 C 29,10.775999 29.223999,11 29.5,11 C 29.776,11 30,10.775999 30,10.5 C 30,10.224001 29.776,10 29.5,10 z M 18.5,11 C 18.224,11 17.999999,11.224 18,11.5 C 18,11.775999 18.223999,12 18.5,12 C 18.776,12 19,11.775999 19,11.5 C 19,11.224001 18.776,11 18.5,11 z M 20.5,11 C 20.224,11 19.999999,11.224 20,11.5 C 20,11.775999 20.223999,12 20.5,12 C 20.776,12 21,11.775999 21,11.5 C 21,11.224001 20.776,11 20.5,11 z M 22.5,11 C 22.224,11 21.999999,11.224 22,11.5 C 22,11.775999 22.223999,12 22.5,12 C 22.776,12 23,11.775999 23,11.5 C 23,11.224001 22.776,11 22.5,11 z M 24.5,11 C 24.224,11 23.999999,11.224 24,11.5 C 24,11.775999 24.223999,12 24.5,12 C 24.776,12 25,11.775999 25,11.5 C 25,11.224001 24.776,11 24.5,11 z M 26.5,11 C 26.224,11 25.999999,11.224 26,11.5 C 26,11.775999 26.223999,12 26.5,12 C 26.776,12 27,11.775999 27,11.5 C 27,11.224001 26.776,11 26.5,11 z M 28.5,11 C 28.224,11 27.999999,11.224 28,11.5 C 28,11.775999 28.223999,12 28.5,12 C 28.776,12 29,11.775999 29,11.5 C 29,11.224001 28.776,11 28.5,11 z M 30.5,11 C 30.224,11 30,11.224 30,11.5 C 30,11.776 30.224,12 30.5,12 C 30.776,12 31,11.776 31,11.5 C 31,11.224 30.776,11 30.5,11 z M 19.5,12 C 19.224,12 18.999999,12.224 19,12.5 C 19,12.775999 19.223999,13 19.5,13 C 19.776,13 20,12.775999 20,12.5 C 20,12.224001 19.776,12 19.5,12 z M 21.5,12 C 21.224,12 20.999999,12.224 21,12.5 C 21,12.775999 21.223999,13 21.5,13 C 21.776,13 22,12.775999 22,12.5 C 22,12.224001 21.776,12 21.5,12 z M 23.5,12 C 23.224,12 22.999999,12.224 23,12.5 C 23,12.775999 23.223999,13 23.5,13 C 23.776,13 24,12.775999 24,12.5 C 24,12.224001 23.776,12 23.5,12 z M 25.5,12 C 25.224,12 24.999999,12.224 25,12.5 C 25,12.775999 25.223999,13 25.5,13 C 25.776,13 26,12.775999 26,12.5 C 26,12.224001 25.776,12 25.5,12 z M 27.5,12 C 27.224,12 26.999999,12.224 27,12.5 C 27,12.775999 27.223999,13 27.5,13 C 27.776,13 28,12.775999 28,12.5 C 28,12.224001 27.776,12 27.5,12 z M 29.5,12 C 29.224,12 28.999999,12.224 29,12.5 C 29,12.775999 29.223999,13 29.5,13 C 29.776,13 30,12.775999 30,12.5 C 30,12.224001 29.776,12 29.5,12 z M 18.5,13 C 18.224,13 17.999999,13.224 18,13.5 C 18,13.775999 18.223999,14 18.5,14 C 18.776,14 19,13.775999 19,13.5 C 19,13.224001 18.776,13 18.5,13 z M 20.5,13 C 20.224,13 19.999999,13.224 20,13.5 C 20,13.775999 20.223999,14 20.5,14 C 20.776,14 21,13.775999 21,13.5 C 21,13.224001 20.776,13 20.5,13 z M 22.5,13 C 22.224,13 21.999999,13.224 22,13.5 C 22,13.775999 22.223999,14 22.5,14 C 22.776,14 23,13.775999 23,13.5 C 23,13.224001 22.776,13 22.5,13 z M 24.5,13 C 24.224,13 23.999999,13.224 24,13.5 C 24,13.775999 24.223999,14 24.5,14 C 24.776,14 25,13.775999 25,13.5 C 25,13.224001 24.776,13 24.5,13 z M 26.5,13 C 26.224,13 25.999999,13.224 26,13.5 C 26,13.775999 26.223999,14 26.5,14 C 26.776,14 27,13.775999 27,13.5 C 27,13.224001 26.776,13 26.5,13 z M 28.5,13 C 28.224,13 27.999999,13.224 28,13.5 C 28,13.775999 28.223999,14 28.5,14 C 28.776,14 29,13.775999 29,13.5 C 29,13.224001 28.776,13 28.5,13 z M 30.5,13 C 30.224,13 30,13.224 30,13.5 C 30,13.776 30.224,14 30.5,14 C 30.776,14 31,13.776 31,13.5 C 31,13.224 30.776,13 30.5,13 z M 19.5,14 C 19.224,14 18.999999,14.224 19,14.5 C 19,14.775999 19.223999,15 19.5,15 C 19.776,15 20,14.775999 20,14.5 C 20,14.224001 19.776,14 19.5,14 z M 21.5,14 C 21.224,14 20.999999,14.224 21,14.5 C 21,14.775999 21.223999,15 21.5,15 C 21.776,15 22,14.775999 22,14.5 C 22,14.224001 21.776,14 21.5,14 z M 23.5,14 C 23.224,14 22.999999,14.224 23,14.5 C 23,14.775999 23.223999,15 23.5,15 C 23.776,15 24,14.775999 24,14.5 C 24,14.224001 23.776,14 23.5,14 z M 25.5,14 C 25.224,14 24.999999,14.224 25,14.5 C 25,14.775999 25.223999,15 25.5,15 C 25.776,15 26,14.775999 26,14.5 C 26,14.224001 25.776,14 25.5,14 z M 27.5,14 C 27.224,14 26.999999,14.224 27,14.5 C 27,14.775999 27.223999,15 27.5,15 C 27.776,15 28,14.775999 28,14.5 C 28,14.224001 27.776,14 27.5,14 z M 29.5,14 C 29.224,14 28.999999,14.224 29,14.5 C 29,14.775999 29.223999,15 29.5,15 C 29.776,15 30,14.775999 30,14.5 C 30,14.224001 29.776,14 29.5,14 z M 18.5,15 C 18.224,15 17.999999,15.224 18,15.5 C 18,15.775999 18.223999,16 18.5,16 C 18.776,16 19,15.775999 19,15.5 C 19,15.224001 18.776,15 18.5,15 z M 20.5,15 C 20.224,15 19.999999,15.224 20,15.5 C 20,15.775999 20.223999,16 20.5,16 C 20.776,16 21,15.775999 21,15.5 C 21,15.224001 20.776,15 20.5,15 z M 22.5,15 C 22.224,15 21.999999,15.224 22,15.5 C 22,15.775999 22.223999,16 22.5,16 C 22.776,16 23,15.775999 23,15.5 C 23,15.224001 22.776,15 22.5,15 z M 24.5,15 C 24.224,15 23.999999,15.224 24,15.5 C 24,15.775999 24.223999,16 24.5,16 C 24.776,16 25,15.775999 25,15.5 C 25,15.224001 24.776,15 24.5,15 z M 26.5,15 C 26.224,15 25.999999,15.224 26,15.5 C 26,15.775999 26.223999,16 26.5,16 C 26.776,16 27,15.775999 27,15.5 C 27,15.224001 26.776,15 26.5,15 z M 28.5,15 C 28.224,15 27.999999,15.224 28,15.5 C 28,15.775999 28.223999,16 28.5,16 C 28.776,16 29,15.775999 29,15.5 C 29,15.224001 28.776,15 28.5,15 z M 30.5,15 C 30.224,15 30,15.224 30,15.5 C 30,15.776 30.224,16 30.5,16 C 30.776,16 31,15.776 31,15.5 C 31,15.224 30.776,15 30.5,15 z M 19.5,16 C 19.224,16 18.999999,16.224001 19,16.5 C 19,16.775999 19.223999,17 19.5,17 C 19.776,17 20,16.776 20,16.5 C 20,16.224001 19.776,16 19.5,16 z M 21.5,16 C 21.224,16 20.999999,16.224001 21,16.5 C 21,16.775999 21.223999,17 21.5,17 C 21.776,17 22,16.776 22,16.5 C 22,16.224001 21.776,16 21.5,16 z M 23.5,16 C 23.224,16 22.999999,16.224001 23,16.5 C 23,16.775999 23.223999,17 23.5,17 C 23.776,17 24,16.776 24,16.5 C 24,16.224001 23.776,16 23.5,16 z M 25.5,16 C 25.224,16 24.999999,16.224001 25,16.5 C 25,16.775999 25.223999,17 25.5,17 C 25.776,17 26,16.776 26,16.5 C 26,16.224001 25.776,16 25.5,16 z M 27.5,16 C 27.224,16 26.999999,16.224001 27,16.5 C 27,16.775999 27.223999,17 27.5,17 C 27.776,17 28,16.776 28,16.5 C 28,16.224001 27.776,16 27.5,16 z M 29.5,16 C 29.224,16 28.999999,16.224 29,16.5 C 29,16.775999 29.223999,17 29.5,17 C 29.776,17 30,16.775999 30,16.5 C 30,16.224001 29.776,16 29.5,16 z M 18.5,17 C 18.224,17 17.999999,17.224001 18,17.5 C 18,17.775999 18.223999,18 18.5,18 C 18.776,18 19,17.776 19,17.5 C 19,17.224001 18.776,17 18.5,17 z M 20.5,17 C 20.224,17 19.999999,17.224001 20,17.5 C 20,17.775999 20.223999,18 20.5,18 C 20.776,18 21,17.776 21,17.5 C 21,17.224001 20.776,17 20.5,17 z M 22.5,17 C 22.224,17 21.999999,17.224001 22,17.5 C 22,17.775999 22.223999,18 22.5,18 C 22.776,18 23,17.776 23,17.5 C 23,17.224001 22.776,17 22.5,17 z M 24.5,17 C 24.224,17 23.999999,17.224001 24,17.5 C 24,17.775999 24.223999,18 24.5,18 C 24.776,18 25,17.776 25,17.5 C 25,17.224001 24.776,17 24.5,17 z M 26.5,17 C 26.224,17 25.999999,17.224001 26,17.5 C 26,17.775999 26.223999,18 26.5,18 C 26.776,18 27,17.776 27,17.5 C 27,17.224001 26.776,17 26.5,17 z M 28.5,17 C 28.224,17 27.999999,17.224001 28,17.5 C 28,17.775999 28.223999,18 28.5,18 C 28.776,18 29,17.776 29,17.5 C 29,17.224001 28.776,17 28.5,17 z M 30.5,17 C 30.224,17 30,17.224 30,17.5 C 30,17.776 30.224,18 30.5,18 C 30.776,18 31,17.776 31,17.5 C 31,17.224 30.776,17 30.5,17 z M 19.5,18 C 19.224,18 18.999999,18.224001 19,18.5 C 19,18.775999 19.223999,19 19.5,19 C 19.776,19 20,18.776 20,18.5 C 20,18.224001 19.776,18 19.5,18 z M 21.5,18 C 21.224,18 20.999999,18.224001 21,18.5 C 21,18.775999 21.223999,19 21.5,19 C 21.776,19 22,18.776 22,18.5 C 22,18.224001 21.776,18 21.5,18 z M 23.5,18 C 23.224,18 22.999999,18.224001 23,18.5 C 23,18.775999 23.223999,19 23.5,19 C 23.776,19 24,18.776 24,18.5 C 24,18.224001 23.776,18 23.5,18 z M 25.5,18 C 25.224,18 24.999999,18.224001 25,18.5 C 25,18.775999 25.223999,19 25.5,19 C 25.776,19 26,18.776 26,18.5 C 26,18.224001 25.776,18 25.5,18 z M 27.5,18 C 27.224,18 26.999999,18.224001 27,18.5 C 27,18.775999 27.223999,19 27.5,19 C 27.776,19 28,18.776 28,18.5 C 28,18.224001 27.776,18 27.5,18 z M 29.5,18 C 29.224,18 28.999999,18.224001 29,18.5 C 29,18.775999 29.223999,19 29.5,19 C 29.776,19 30,18.776 30,18.5 C 30,18.224001 29.776,18 29.5,18 z M 18.5,19 C 18.224,19 17.999999,19.224001 18,19.5 C 18,19.775999 18.223999,19.999999 18.5,20 C 18.776,20 19,19.776 19,19.5 C 19,19.224001 18.776,19 18.5,19 z M 20.5,19 C 20.224,19 19.999999,19.224001 20,19.5 C 20,19.775999 20.223999,19.999999 20.5,20 C 20.776,20 21,19.776 21,19.5 C 21,19.224001 20.776,19 20.5,19 z M 22.5,19 C 22.224,19 21.999999,19.224001 22,19.5 C 22,19.775999 22.223999,19.999999 22.5,20 C 22.776,20 23,19.776 23,19.5 C 23,19.224001 22.776,19 22.5,19 z M 24.5,19 C 24.224,19 23.999999,19.224001 24,19.5 C 24,19.775999 24.223999,19.999999 24.5,20 C 24.776,20 25,19.776 25,19.5 C 25,19.224001 24.776,19 24.5,19 z M 26.5,19 C 26.224,19 25.999999,19.224001 26,19.5 C 26,19.775999 26.223999,19.999999 26.5,20 C 26.776,20 27,19.776 27,19.5 C 27,19.224001 26.776,19 26.5,19 z M 28.5,19 C 28.224,19 27.999999,19.224001 28,19.5 C 28,19.775999 28.223999,19.999999 28.5,20 C 28.776,20 29,19.776 29,19.5 C 29,19.224001 28.776,19 28.5,19 z M 30.5,19 C 30.224,19 30,19.224 30,19.5 C 30,19.776 30.224,20 30.5,20 C 30.776,20 31,19.776 31,19.5 C 31,19.224 30.776,19 30.5,19 z M 19.5,20 C 19.224,20 18.999999,20.224001 19,20.5 C 19,20.775999 19.223999,20.999999 19.5,21 C 19.776,21 20,20.776 20,20.5 C 20,20.224001 19.776,20 19.5,20 z M 21.5,20 C 21.224,20 20.999999,20.224001 21,20.5 C 21,20.775999 21.223999,20.999999 21.5,21 C 21.776,21 22,20.776 22,20.5 C 22,20.224001 21.776,20 21.5,20 z M 23.5,20 C 23.224,20 22.999999,20.224001 23,20.5 C 23,20.775999 23.223999,20.999999 23.5,21 C 23.776,21 24,20.776 24,20.5 C 24,20.224001 23.776,20 23.5,20 z M 25.5,20 C 25.224,20 24.999999,20.224001 25,20.5 C 25,20.775999 25.223999,20.999999 25.5,21 C 25.776,21 26,20.776 26,20.5 C 26,20.224001 25.776,20 25.5,20 z M 27.5,20 C 27.224,20 26.999999,20.224001 27,20.5 C 27,20.775999 27.223999,20.999999 27.5,21 C 27.776,21 28,20.776 28,20.5 C 28,20.224001 27.776,20 27.5,20 z M 29.5,20 C 29.224,20 28.999999,20.224001 29,20.5 C 29,20.775999 29.223999,20.999999 29.5,21 C 29.776,21 30,20.776 30,20.5 C 30,20.224001 29.776,20 29.5,20 z M 20.5,21 C 20.224,21 19.999999,21.224001 20,21.5 C 20,21.775999 20.223999,21.999999 20.5,22 C 20.776,22 21,21.776 21,21.5 C 21,21.224001 20.776,21 20.5,21 z M 22.5,21 C 22.224,21 21.999999,21.224001 22,21.5 C 22,21.775999 22.223999,21.999999 22.5,22 C 22.776,22 23,21.776 23,21.5 C 23,21.224001 22.776,21 22.5,21 z M 24.5,21 C 24.224,21 23.999999,21.224001 24,21.5 C 24,21.775999 24.223999,21.999999 24.5,22 C 24.776,22 25,21.776 25,21.5 C 25,21.224001 24.776,21 24.5,21 z M 26.5,21 C 26.224,21 25.999999,21.224001 26,21.5 C 26,21.775999 26.223999,21.999999 26.5,22 C 26.776,22 27,21.776 27,21.5 C 27,21.224001 26.776,21 26.5,21 z M 28.5,21 C 28.224,21 27.999999,21.224001 28,21.5 C 28,21.775999 28.223999,21.999999 28.5,22 C 28.776,22 29,21.776 29,21.5 C 29,21.224001 28.776,21 28.5,21 z M 21.5,22 C 21.224,22 20.999999,22.224001 21,22.5 C 21,22.775999 21.223999,22.999999 21.5,23 C 21.776,23 22,22.776 22,22.5 C 22,22.224001 21.776,22 21.5,22 z M 23.5,22 C 23.224,22 22.999999,22.224001 23,22.5 C 23,22.775999 23.223999,22.999999 23.5,23 C 23.776,23 24,22.776 24,22.5 C 24,22.224001 23.776,22 23.5,22 z M 25.5,22 C 25.224,22 24.999999,22.224001 25,22.5 C 25,22.775999 25.223999,22.999999 25.5,23 C 25.776,23 26,22.776 26,22.5 C 26,22.224001 25.776,22 25.5,22 z M 27.5,22 C 27.224,22 26.999999,22.224001 27,22.5 C 27,22.775999 27.223999,22.999999 27.5,23 C 27.776,23 28,22.776 28,22.5 C 28,22.224001 27.776,22 27.5,22 z M 22.5,23 C 22.224,23 21.999999,23.224001 22,23.5 C 22,23.775999 22.223999,23.999999 22.5,24 C 22.776,24 23,23.776 23,23.5 C 23,23.224001 22.776,23 22.5,23 z M 24.5,23 C 24.224,23 23.999999,23.224001 24,23.5 C 24,23.775999 24.223999,23.999999 24.5,24 C 24.776,24 25,23.776 25,23.5 C 25,23.224001 24.776,23 24.5,23 z M 26.5,23 C 26.224,23 25.999999,23.224001 26,23.5 C 26,23.775999 26.223999,23.999999 26.5,24 C 26.776,24 27,23.776 27,23.5 C 27,23.224001 26.776,23 26.5,23 z M 23.5,24 C 23.224,24 22.999999,24.224001 23,24.5 C 23,24.775999 23.223999,24.999999 23.5,25 C 23.776,25 24,24.776 24,24.5 C 24,24.224001 23.776,24 23.5,24 z M 25.5,24 C 25.224,24 24.999999,24.224001 25,24.5 C 25,24.775999 25.223999,24.999999 25.5,25 C 25.776,25 26,24.776 26,24.5 C 26,24.224001 25.776,24 25.5,24 z"
-         style="opacity:0.5;fill:url(#linearGradient2573);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-      <rect
-         ry="6.0500031"
-         rx="6.0000024"
-         y="2.5000026"
-         x="18.500008"
-         height="22.000008"
-         width="12.000005"
-         id="rect2967"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient2575);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       id="layer4"
-       inkscape:label="Muted"
-       style="display:inline"
-       transform="matrix(1.0828519,0,0,1.0830642,-27.371634,-7.2945649)">
-      <g
-         id="g4694"
-         transform="translate(-2,0)">
-        <rect
-           ry="1.4868355"
-           rx="1.4868355"
-           y="16.498245"
-           x="31.498245"
-           height="12.00351"
-           width="12.00351"
-           id="rect2021"
-           style="opacity:1;fill:#ef2929;fill-opacity:1;stroke:#a40000;stroke-width:0.92015547;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-        <rect
-           ry="0.49373779"
-           rx="0.49383482"
-           y="17.420549"
-           x="32.420815"
-           height="10.156369"
-           width="10.158366"
-           id="rect3795"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.92339665;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;display:inline" />
-        <path
-           sodipodi:nodetypes="cc"
-           id="path4682"
-           d="M 35,20 L 40,25"
-           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.38509536;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cc"
-           id="path4684"
-           d="M 40,20 L 35,25"
-           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.38509536;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/mate-volume-control/data/mate-volume-control-applet.desktop.in b/mate-volume-control/data/mate-volume-control-applet.desktop.in
deleted file mode 100644
index 8d4208f..0000000
--- a/mate-volume-control/data/mate-volume-control-applet.desktop.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-_Name=Volume Control
-_Comment=Show desktop volume control
-Icon=multimedia-volume-control
-Exec=mate-volume-control-applet
-Terminal=false
-Type=Application
-Categories=AudioVideo;Mixer;Settings;HardwareSettings;
-Keywords=MATE;volume;control;mixer;settings;sound;
-NoDisplay=true
-OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-media
-X-MATE-Bugzilla-Component=mate-volume-control
-# See http://bugzilla.mate.org/show_bug.cgi?id=568320
-#X-MATE-Autostart-Phase=Panel
-X-MATE-Autostart-Notify=true
diff --git a/mate-volume-control/data/mate-volume-control.desktop.in.in b/mate-volume-control/data/mate-volume-control.desktop.in.in
deleted file mode 100644
index 60708a4..0000000
--- a/mate-volume-control/data/mate-volume-control.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Sound
-_Comment=Change sound volume and sound events
-Exec=mate-volume-control
-Icon=multimedia-volume-control
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=AudioVideo;Mixer;Settings;HardwareSettings;
-Keywords=MATE;volume;control;mixer;settings;sound;events;
-OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-media
-X-MATE-Bugzilla-Component=mate-volume-control
-X-MATE-Bugzilla-Version=@VERSION@
diff --git a/mate-volume-control/src/dialog-main.c b/mate-volume-control/dialog-main.c
index c111c26..08c55fc 100644
--- a/mate-volume-control/src/dialog-main.c
+++ b/mate-volume-control/dialog-main.c
@@ -34,6 +34,7 @@
 #define DIALOG_POPUP_TIMEOUT 3
 
 static guint       popup_id = 0;
+static gboolean    debug = FALSE;
 static gboolean    show_version = FALSE;
 
 static gchar      *page = NULL;
@@ -181,6 +182,7 @@ main (int argc, char **argv)
         UniqueApp        *app;
         GOptionEntry      entries[] = {
                 { "backend", 'b', 0, G_OPTION_ARG_STRING, &backend, N_("Sound system backend"), "pulse|alsa|oss|null" },
+                { "debug",   'd', 0, G_OPTION_ARG_NONE,   &debug, N_("Enable debug"), NULL },
                 { "page",    'p', 0, G_OPTION_ARG_STRING, &page, N_("Startup page"), "effects|hardware|input|output|applications" },
                 { "version", 'v', 0, G_OPTION_ARG_NONE,   &show_version, N_("Version of this application"), NULL },
                 { NULL }
@@ -203,6 +205,9 @@ main (int argc, char **argv)
                 g_print ("%s %s\n", argv[0], VERSION);
                 return 0;
         }
+        if (debug == TRUE) {
+                g_setenv ("G_MESSAGES_DEBUG", "all", FALSE);
+        }
 
         app = unique_app_new (GVC_DIALOG_DBUS_NAME, NULL);
 
diff --git a/mate-volume-control/src/gvc-applet.c b/mate-volume-control/gvc-applet.c
index 3cb691f..3cb691f 100644
--- a/mate-volume-control/src/gvc-applet.c
+++ b/mate-volume-control/gvc-applet.c
diff --git a/mate-volume-control/src/gvc-applet.h b/mate-volume-control/gvc-applet.h
index 991ef6d..991ef6d 100644
--- a/mate-volume-control/src/gvc-applet.h
+++ b/mate-volume-control/gvc-applet.h
diff --git a/mate-volume-control/src/gvc-balance-bar.c b/mate-volume-control/gvc-balance-bar.c
index 7431773..7431773 100644
--- a/mate-volume-control/src/gvc-balance-bar.c
+++ b/mate-volume-control/gvc-balance-bar.c
diff --git a/mate-volume-control/src/gvc-balance-bar.h b/mate-volume-control/gvc-balance-bar.h
index d5b142d..d5b142d 100644
--- a/mate-volume-control/src/gvc-balance-bar.h
+++ b/mate-volume-control/gvc-balance-bar.h
diff --git a/mate-volume-control/src/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c
index e431651..e431651 100644
--- a/mate-volume-control/src/gvc-channel-bar.c
+++ b/mate-volume-control/gvc-channel-bar.c
diff --git a/mate-volume-control/src/gvc-channel-bar.h b/mate-volume-control/gvc-channel-bar.h
index 1c80be9..1c80be9 100644
--- a/mate-volume-control/src/gvc-channel-bar.h
+++ b/mate-volume-control/gvc-channel-bar.h
diff --git a/mate-volume-control/src/gvc-combo-box.c b/mate-volume-control/gvc-combo-box.c
index b2a273f..25c4639 100644
--- a/mate-volume-control/src/gvc-combo-box.c
+++ b/mate-volume-control/gvc-combo-box.c
@@ -32,16 +32,14 @@
 
 struct _GvcComboBoxPrivate
 {
-        GtkWidget     *drop_box;
-        GtkWidget     *start_box;
-        GtkWidget     *end_box;
-        GtkWidget     *label;
-        GtkWidget     *button;
-        GtkTreeModel  *model;
-        GtkWidget     *combobox;
-        gboolean       set_called;
-        GtkSizeGroup  *size_group;
-        gboolean       symmetric;
+        GtkWidget       *drop_box;
+        GtkWidget       *start_box;
+        GtkWidget       *end_box;
+        GtkWidget       *label;
+        GtkWidget       *button;
+        GtkTreeModel    *model;
+        GtkWidget       *combobox;
+        MateMixerSwitch *swtch;
 };
 
 enum {
@@ -51,7 +49,7 @@ enum {
 };
 
 enum {
-        CHANGED,
+        CHANGING,
         BUTTON_CLICKED,
         LAST_SIGNAL
 };
@@ -60,6 +58,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 
 enum {
         PROP_0,
+        PROP_SWITCH,
         PROP_LABEL,
         PROP_SHOW_BUTTON,
         PROP_BUTTON_LABEL,
@@ -78,6 +77,14 @@ G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_BOX)
 G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_HBOX)
 #endif
 
+MateMixerSwitch *
+gvc_combo_box_get_switch (GvcComboBox *combobox)
+{
+        g_return_val_if_fail (GVC_IS_COMBO_BOX (combobox), NULL);
+
+        return combobox->priv->swtch;
+}
+
 void
 gvc_combo_box_set_size_group (GvcComboBox  *combobox,
                               GtkSizeGroup *group,
@@ -86,18 +93,89 @@ gvc_combo_box_set_size_group (GvcComboBox  *combobox,
         g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
         g_return_if_fail (GTK_IS_SIZE_GROUP (group));
 
-        combobox->priv->size_group = group;
-        combobox->priv->symmetric = symmetric;
+        if (group != NULL) {
+                gtk_size_group_add_widget (group, combobox->priv->start_box);
+                if (symmetric == TRUE)
+                        gtk_size_group_add_widget (group, combobox->priv->end_box);
+        }
+        gtk_widget_queue_draw (GTK_WIDGET (combobox));
+}
 
-        if (combobox->priv->size_group != NULL) {
-                gtk_size_group_add_widget (combobox->priv->size_group,
-                                           combobox->priv->start_box);
+static void
+on_switch_active_option_notify (MateMixerSwitch *swtch,
+                                GParamSpec      *pspec,
+                                GvcComboBox     *combobox)
+{
+        GtkTreeIter            iter;
+        MateMixerSwitchOption *active;
+        gboolean               cont;
+        const gchar           *name;
+
+        active = mate_mixer_switch_get_active_option (swtch);
+        if G_UNLIKELY (active == NULL) {
+                g_warn_if_reached ();
+                return;
+        }
+
+        /* Select the newly activated switch option in the combo box */
+        name = mate_mixer_switch_option_get_name (active);
+        cont = gtk_tree_model_get_iter_first (combobox->priv->model, &iter);
+        while (cont == TRUE) {
+                gchar *current;
 
-                if (combobox->priv->symmetric)
-                        gtk_size_group_add_widget (combobox->priv->size_group,
-                                                   combobox->priv->end_box);
+                gtk_tree_model_get (combobox->priv->model, &iter,
+                                    COL_NAME, &current,
+                                    -1);
+                if (g_strcmp0 (name, current) == 0) {
+                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox), &iter);
+                        g_free (current);
+                        return;
+                }
+                g_free (current);
+
+                cont = gtk_tree_model_iter_next (combobox->priv->model, &iter);
         }
-        gtk_widget_queue_draw (GTK_WIDGET (combobox));
+        g_warning ("Could not find switch option '%s' in combo box", name);
+}
+
+static void
+gvc_combo_box_set_switch (GvcComboBox *combobox, MateMixerSwitch *swtch)
+{
+        MateMixerSwitchOption *active;
+        const GList           *options;
+
+        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
+        g_return_if_fail (MATE_MIXER_IS_SWITCH (swtch));
+
+        combobox->priv->swtch = g_object_ref (swtch);
+
+        active  = mate_mixer_switch_get_active_option (swtch);
+        options = mate_mixer_switch_list_options (swtch);
+        while (options != NULL) {
+                GtkTreeIter            iter;
+                MateMixerSwitchOption *option = MATE_MIXER_SWITCH_OPTION (options->data);
+
+                gtk_list_store_insert_with_values (GTK_LIST_STORE (combobox->priv->model),
+                                                   &iter,
+                                                   G_MAXINT,
+                                                   COL_NAME,
+                                                   mate_mixer_switch_option_get_name (option),
+                                                   COL_HUMAN_NAME,
+                                                   mate_mixer_switch_option_get_label (option),
+                                                   -1);
+
+                /* Select the currently active option of the switch */
+                if (option == active) {
+                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox),
+                                                       &iter);
+                }
+                options = options->next;
+        }
+
+        g_signal_connect (G_OBJECT (swtch),
+                          "notify::active-option",
+                          G_CALLBACK (on_switch_active_option_notify),
+                          combobox);
 }
 
 static void
@@ -109,6 +187,9 @@ gvc_combo_box_set_property (GObject       *object,
         GvcComboBox *self = GVC_COMBO_BOX (object);
 
         switch (prop_id) {
+        case PROP_SWITCH:
+                gvc_combo_box_set_switch (self, g_value_get_object (value));
+                break;
         case PROP_LABEL:
                 gtk_label_set_text_with_mnemonic (GTK_LABEL (self->priv->label), g_value_get_string (value));
                 break;
@@ -133,6 +214,9 @@ gvc_combo_box_get_property (GObject     *object,
         GvcComboBox *self = GVC_COMBO_BOX (object);
 
         switch (prop_id) {
+        case PROP_SWITCH:
+                g_value_set_object (value, self->priv->swtch);
+                break;
         case PROP_LABEL:
                 g_value_set_string (value, gtk_label_get_text (GTK_LABEL (self->priv->label)));
                 break;
@@ -157,37 +241,54 @@ gvc_combo_box_class_init (GvcComboBoxClass *klass)
         object_class->set_property = gvc_combo_box_set_property;
         object_class->get_property = gvc_combo_box_get_property;
 
+        properties[PROP_SWITCH] =
+                g_param_spec_object ("switch",
+                                     "switch",
+                                     "The MateMixerSwitch",
+                                     MATE_MIXER_TYPE_SWITCH,
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT_ONLY |
+                                     G_PARAM_STATIC_STRINGS);
+
         properties[PROP_LABEL] =
                 g_param_spec_string ("label",
                                      "label",
                                      "The combo box label",
                                      _("_Profile:"),
-                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT |
+                                     G_PARAM_STATIC_STRINGS);
 
         properties[PROP_SHOW_BUTTON] =
                 g_param_spec_boolean ("show-button",
                                       "show-button",
                                       "Whether to show the button",
                                       FALSE,
-                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                      G_PARAM_READWRITE |
+                                      G_PARAM_CONSTRUCT |
+                                      G_PARAM_STATIC_STRINGS);
 
         properties[PROP_BUTTON_LABEL] =
                 g_param_spec_string ("button-label",
                                      "button-label",
                                      "The button's label",
                                      "",
-                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT |
+                                     G_PARAM_STATIC_STRINGS);
 
         g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 
-        signals[CHANGED] =
-                g_signal_new ("changed",
+        signals[CHANGING] =
+                g_signal_new ("changing",
                               G_TYPE_FROM_CLASS (klass),
                               G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GvcComboBoxClass, changed),
+                              G_STRUCT_OFFSET (GvcComboBoxClass, changing),
                               NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE, 1, G_TYPE_STRING);
+                              g_cclosure_marshal_VOID__VOID,
+                              G_TYPE_NONE,
+                              1,
+                              MATE_MIXER_TYPE_SWITCH_OPTION);
 
         signals[BUTTON_CLICKED] =
                 g_signal_new ("button-clicked",
@@ -196,84 +297,46 @@ gvc_combo_box_class_init (GvcComboBoxClass *klass)
                               G_STRUCT_OFFSET (GvcComboBoxClass, button_clicked),
                               NULL, NULL,
                               g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0, G_TYPE_NONE);
+                              G_TYPE_NONE,
+                              0,
+                              G_TYPE_NONE);
 
         g_type_class_add_private (klass, sizeof (GvcComboBoxPrivate));
 }
 
-void
-gvc_combo_box_set_options (GvcComboBox *combobox, const GList *options)
-{
-        const GList *l;
-
-        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
-        g_return_if_fail (combobox->priv->set_called == FALSE);
-
-        for (l = options; l != NULL; l = l->next) {
-                MateMixerSwitchOption *option = MATE_MIXER_SWITCH_OPTION (l->data);
-
-                gtk_list_store_insert_with_values (GTK_LIST_STORE (combobox->priv->model),
-                                                   NULL,
-                                                   G_MAXINT,
-                                                   COL_NAME,
-                                                   mate_mixer_switch_option_get_name (option),
-                                                   COL_HUMAN_NAME,
-                                                   mate_mixer_switch_option_get_label (option),
-                                                   -1);
-        }
-        combobox->priv->set_called = TRUE;
-}
-
-void
-gvc_combo_box_set_active (GvcComboBox *combobox, const gchar *id)
-{
-        GtkTreeIter iter;
-        gboolean    cont;
-
-        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
-        g_return_if_fail (id != NULL);
-
-        cont = gtk_tree_model_get_iter_first (combobox->priv->model, &iter);
-        while (cont != FALSE) {
-                gchar *name;
-
-                gtk_tree_model_get (combobox->priv->model, &iter,
-                                    COL_NAME, &name,
-                                    -1);
-                if (g_strcmp0 (name, id) == 0) {
-                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox), &iter);
-                        g_free (name);
-                        return;
-                }
-                g_free (name);
-
-                gtk_tree_model_iter_next (combobox->priv->model, &iter);
-        }
-        g_warning ("Could not find id '%s' in combo box", id);
-}
-
 static void
 on_combo_box_changed (GtkComboBox *widget, GvcComboBox *combobox)
 {
-        GtkTreeIter iter;
-        gchar      *profile;
+        GtkTreeIter            iter;
+        gchar                 *name;
+        MateMixerSwitchOption *option;
 
-        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter) == FALSE) {
-                g_warning ("Could not find an active profile or port");
+        if G_UNLIKELY (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter) == FALSE)
                 return;
-        }
 
         gtk_tree_model_get (combobox->priv->model, &iter,
-                            COL_NAME, &profile,
+                            COL_NAME, &name,
                             -1);
 
-        g_signal_emit (combobox, signals[CHANGED], 0, profile);
-        g_free (profile);
+        option = mate_mixer_switch_get_option (combobox->priv->swtch, name);
+        if G_UNLIKELY (option == NULL) {
+                g_warn_if_reached ();
+                g_free (name);
+                return;
+        }
+
+        /* Inform that we are about to change the active option of the switch */
+        g_signal_emit (combobox, signals[CHANGING], 0, option);
+
+        mate_mixer_switch_set_active_option (combobox->priv->swtch, option);
+        g_free (name);
 }
 
 static void
 on_combo_box_button_clicked (GtkButton *button, GvcComboBox *combobox)
 {
+        /* The meaning of the button is defined by the owner, so only notify
+         * when it is clicked on */
         g_signal_emit (combobox, signals[BUTTON_CLICKED], 0);
 }
 
@@ -283,30 +346,21 @@ gvc_combo_box_init (GvcComboBox *combobox)
         GtkWidget       *frame;
         GtkCellRenderer *renderer;
 
+        frame = gtk_frame_new (NULL);
+        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+
         combobox->priv = GVC_COMBO_BOX_GET_PRIVATE (combobox);
 
         combobox->priv->model = GTK_TREE_MODEL (gtk_list_store_new (NUM_COLS,
                                                                     G_TYPE_STRING,
                                                                     G_TYPE_STRING));
-        combobox->priv->label = gtk_label_new (NULL);
-
-        gtk_misc_set_alignment (GTK_MISC (combobox->priv->label), 0.0, 0.5);
 
-        /* Frame */
-        frame = gtk_frame_new (NULL);
-        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-        gtk_box_pack_start (GTK_BOX (combobox), frame, TRUE, TRUE, 0);
+        combobox->priv->combobox = gtk_combo_box_new_with_model (combobox->priv->model);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-        combobox->priv->drop_box  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-        combobox->priv->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-        combobox->priv->end_box   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
-        combobox->priv->drop_box  = gtk_hbox_new (FALSE, 6);
-        combobox->priv->start_box = gtk_hbox_new (FALSE, 6);
-        combobox->priv->end_box   = gtk_hbox_new (FALSE, 6);
-#endif
-        combobox->priv->combobox  = gtk_combo_box_new_with_model (combobox->priv->model);
+        combobox->priv->label = gtk_label_new (NULL);
+        gtk_misc_set_alignment (GTK_MISC (combobox->priv->label), 0.0, 0.5);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (combobox->priv->label),
+                                       combobox->priv->combobox);
 
         renderer = gtk_cell_renderer_text_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox->priv->combobox),
@@ -318,6 +372,10 @@ gvc_combo_box_init (GvcComboBox *combobox)
                                        COL_HUMAN_NAME);
 
 #if GTK_CHECK_VERSION (3, 0, 0)
+        combobox->priv->drop_box  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+        combobox->priv->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+        combobox->priv->end_box   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
         /* Make sure the combo box does not get too long on long profile names */
         g_object_set (G_OBJECT (renderer),
                       "ellipsize",
@@ -325,8 +383,16 @@ gvc_combo_box_init (GvcComboBox *combobox)
                       NULL);
 
         gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox->priv->combobox), FALSE);
+#else
+        combobox->priv->drop_box  = gtk_hbox_new (FALSE, 6);
+        combobox->priv->start_box = gtk_hbox_new (FALSE, 6);
+        combobox->priv->end_box   = gtk_hbox_new (FALSE, 6);
 #endif
 
+        gtk_box_pack_start (GTK_BOX (combobox),
+                            frame,
+                            TRUE, TRUE, 0);
+
         gtk_box_pack_start (GTK_BOX (combobox->priv->drop_box),
                             combobox->priv->start_box,
                             FALSE, FALSE, 0);
@@ -346,22 +412,7 @@ gvc_combo_box_init (GvcComboBox *combobox)
                             combobox->priv->end_box,
                             FALSE, FALSE, 0);
 
-        gtk_widget_set_no_show_all (combobox->priv->button, TRUE);
-
-        if (combobox->priv->size_group != NULL) {
-                gtk_size_group_add_widget (combobox->priv->size_group,
-                                           combobox->priv->start_box);
-
-                if (combobox->priv->symmetric)
-                        gtk_size_group_add_widget (combobox->priv->size_group,
-                                                   combobox->priv->end_box);
-        }
-
-        gtk_label_set_mnemonic_widget (GTK_LABEL (combobox->priv->label),
-                                       combobox->priv->combobox);
-
         gtk_container_add (GTK_CONTAINER (frame), combobox->priv->drop_box);
-        gtk_widget_show_all (frame);
 
         g_signal_connect (G_OBJECT (combobox->priv->combobox),
                           "changed",
@@ -371,6 +422,9 @@ gvc_combo_box_init (GvcComboBox *combobox)
                           "clicked",
                           G_CALLBACK (on_combo_box_button_clicked),
                           combobox);
+
+        gtk_widget_set_no_show_all (combobox->priv->button, TRUE);
+        gtk_widget_show_all (frame);
 }
 
 static void
@@ -380,15 +434,23 @@ gvc_combo_box_dispose (GObject *object)
 
         combobox = GVC_COMBO_BOX (object);
 
+        if G_LIKELY (combobox->priv->swtch != NULL) {
+                g_signal_handlers_disconnect_by_func (G_OBJECT (combobox->priv->swtch),
+                                                      G_CALLBACK (on_switch_active_option_notify),
+                                                      combobox);
+                g_clear_object (&combobox->priv->swtch);
+        }
+
         g_clear_object (&combobox->priv->model);
 
         G_OBJECT_CLASS (gvc_combo_box_parent_class)->dispose (object);
 }
 
 GtkWidget *
-gvc_combo_box_new (const gchar *label)
+gvc_combo_box_new (MateMixerSwitch *swtch, const gchar *label)
 {
         return g_object_new (GVC_TYPE_COMBO_BOX,
+                             "switch", swtch,
                              "label", label,
 #if GTK_CHECK_VERSION (3, 0, 0)
                              "orientation", GTK_ORIENTATION_HORIZONTAL,
diff --git a/mate-volume-control/src/gvc-combo-box.h b/mate-volume-control/gvc-combo-box.h
index 9a2f425..0767704 100644
--- a/mate-volume-control/src/gvc-combo-box.h
+++ b/mate-volume-control/gvc-combo-box.h
@@ -26,6 +26,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+#include <libmatemixer/matemixer.h>
+
 G_BEGIN_DECLS
 
 #define GVC_TYPE_COMBO_BOX         (gvc_combo_box_get_type ())
@@ -56,23 +58,21 @@ struct _GvcComboBoxClass
 #else
         GtkHBoxClass            parent_class;
 #endif
-        void (* changed)        (GvcComboBox *combobox,
-                                 const gchar *name);
-        void (* button_clicked) (GvcComboBox *combobox);
+        void (* changing)       (GvcComboBox           *combobox,
+                                 MateMixerSwitchOption *option);
+        void (* button_clicked) (GvcComboBox           *combobox);
 };
 
 GType               gvc_combo_box_get_type            (void) G_GNUC_CONST;
 
-GtkWidget *         gvc_combo_box_new                 (const gchar  *label);
+GtkWidget *         gvc_combo_box_new                 (MateMixerSwitch *swtch,
+                                                       const gchar     *label);
 
-void                gvc_combo_box_set_size_group      (GvcComboBox  *combobox,
-                                                       GtkSizeGroup *group,
-                                                       gboolean      symmetric);
+MateMixerSwitch *   gvc_combo_box_get_switch          (GvcComboBox     *combobox);
 
-void                gvc_combo_box_set_options         (GvcComboBox  *combobox,
-                                                       const GList  *options);
-void                gvc_combo_box_set_active          (GvcComboBox  *combobox,
-                                                       const gchar  *id);
+void                gvc_combo_box_set_size_group      (GvcComboBox     *combobox,
+                                                       GtkSizeGroup    *group,
+                                                       gboolean         symmetric);
 
 G_END_DECLS
 
diff --git a/mate-volume-control/src/gvc-level-bar.c b/mate-volume-control/gvc-level-bar.c
index 0f3dc1b..9a67c1d 100644
--- a/mate-volume-control/src/gvc-level-bar.c
+++ b/mate-volume-control/gvc-level-bar.c
@@ -19,16 +19,17 @@
  *
  */
 
-// XXX on gtk3 the last two squares don't get filled
-
 #include <math.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-desktop-utils.h>
+
 #include "gvc-level-bar.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_LEVEL_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_LEVEL_BAR, GvcLevelBarPrivate))
 
@@ -181,13 +182,10 @@ bar_calc_layout (GvcLevelBar *bar)
         gtk_style_context_get_background_color (context,
                                                 GTK_STATE_FLAG_SELECTED,
                                                 &bar->priv->layout.color_fg);
-        gtk_style_context_get_color (context,
-                                     GTK_STATE_FLAG_NORMAL,
-                                     &bar->priv->layout.color_dark);
 
-        mvc_color_shade (&bar->priv->layout.color_dark,
-                         &bar->priv->layout.color_dark,
-                         0.7);
+        mate_desktop_gtk_style_get_dark_color (context,
+                                               GTK_STATE_FLAG_NORMAL,
+                                               &bar->priv->layout.color_dark);
 #else
         GtkStyle *style;
 
@@ -825,6 +823,12 @@ gvc_level_bar_class_init (GvcLevelBarClass *klass)
 static void
 gvc_level_bar_init (GvcLevelBar *bar)
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+        GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (bar));
+
+        gtk_style_context_add_class (context, GTK_STYLE_CLASS_LIST_ROW);
+#endif
+
         bar->priv = GVC_LEVEL_BAR_GET_PRIVATE (bar);
 
         bar->priv->peak_adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,
diff --git a/mate-volume-control/src/gvc-level-bar.h b/mate-volume-control/gvc-level-bar.h
index ef9ae7e..ef9ae7e 100644
--- a/mate-volume-control/src/gvc-level-bar.h
+++ b/mate-volume-control/gvc-level-bar.h
diff --git a/mate-volume-control/src/gvc-mixer-dialog.c b/mate-volume-control/gvc-mixer-dialog.c
index 26e0540..92a72a7 100644
--- a/mate-volume-control/src/gvc-mixer-dialog.c
+++ b/mate-volume-control/gvc-mixer-dialog.c
@@ -36,7 +36,7 @@
 #include "gvc-sound-theme-chooser.h"
 #include "gvc-level-bar.h"
 #include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_MIXER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_DIALOG, GvcMixerDialogPrivate))
 
@@ -143,13 +143,11 @@ find_stream_port_switch (MateMixerStream *stream)
 
         switches = mate_mixer_stream_list_switches (stream);
         while (switches != NULL) {
-                MateMixerSwitch     *swtch = MATE_MIXER_SWITCH (switches->data);
-                MateMixerSwitchFlags flags;
+                MateMixerStreamSwitch *swtch = MATE_MIXER_STREAM_SWITCH (switches->data);
 
-                flags = mate_mixer_switch_get_flags (swtch);
-                if ((flags & MATE_MIXER_SWITCH_TOGGLE) == 0 &&
-                    mate_mixer_switch_get_role (swtch) == MATE_MIXER_SWITCH_ROLE_PORT)
-                    return swtch;
+                if (!MATE_MIXER_IS_TOGGLE (swtch) &&
+                    mate_mixer_stream_switch_get_role (swtch) == MATE_MIXER_STREAM_SWITCH_ROLE_PORT)
+                    return MATE_MIXER_SWITCH (swtch);
 
                 switches = switches->next;
         }
@@ -163,10 +161,10 @@ find_device_profile_switch (MateMixerDevice *device)
 
         switches = mate_mixer_device_list_switches (device);
         while (switches != NULL) {
-                MateMixerSwitch *swtch = MATE_MIXER_SWITCH (switches->data);
+                MateMixerDeviceSwitch *swtch = MATE_MIXER_DEVICE_SWITCH (switches->data);
 
-                if (mate_mixer_switch_get_role (swtch) == MATE_MIXER_SWITCH_ROLE_DEVICE_PROFILE)
-                        return swtch;
+                if (mate_mixer_device_switch_get_role (swtch) == MATE_MIXER_DEVICE_SWITCH_ROLE_PROFILE)
+                        return MATE_MIXER_SWITCH (swtch);
 
                 switches = switches->next;
         }
@@ -253,70 +251,6 @@ update_default_tree_item (GvcMixerDialog  *dialog,
 }
 
 static void
-on_combobox_option_changed (GvcComboBox    *combo,
-                            const gchar    *name,
-                            GvcMixerDialog *dialog)
-{
-        MateMixerSwitch       *swtch;
-        MateMixerSwitchOption *option;
-        const GList           *options;
-
-        swtch = g_object_get_data (G_OBJECT (combo), "switch");
-        if (G_UNLIKELY (swtch == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        options = mate_mixer_switch_list_options (swtch);
-        while (options != NULL) {
-                option = MATE_MIXER_SWITCH_OPTION (options->data);
-
-                if (g_strcmp0 (mate_mixer_switch_option_get_name (option), name) == 0)
-                        break;
-
-                option  = NULL;
-                options = options->next;
-        }
-
-        if (G_UNLIKELY (option == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        mate_mixer_switch_set_active_option (swtch, option);
-}
-
-static GtkWidget *
-create_port_combo_box (GvcMixerDialog  *dialog,
-                       MateMixerSwitch *swtch,
-                       const gchar     *name,
-                       const GList     *items,
-                       const gchar     *active)
-{
-        GtkWidget *combobox;
-
-        combobox = gvc_combo_box_new (name);
-
-        gvc_combo_box_set_options (GVC_COMBO_BOX (combobox), items);
-        gvc_combo_box_set_active (GVC_COMBO_BOX (combobox), active);
-
-        gvc_combo_box_set_size_group (GVC_COMBO_BOX (combobox),
-                                      dialog->priv->size_group,
-                                      FALSE);
-
-        g_object_set_data_full (G_OBJECT (combobox),
-                                "switch",
-                                g_object_ref (swtch),
-                                g_object_unref);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "changed",
-                          G_CALLBACK (on_combobox_option_changed),
-                          dialog);
-        return combobox;
-}
-
-static void
 update_output_settings (GvcMixerDialog *dialog)
 {
         MateMixerStream            *stream;
@@ -420,21 +354,12 @@ update_output_settings (GvcMixerDialog *dialog)
         /* Enable the port selector if the stream has one */
         port_switch = find_stream_port_switch (stream);
         if (port_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
-
-                options = mate_mixer_switch_list_options (port_switch);
-                active  = mate_mixer_switch_get_active_option (port_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
-
                 dialog->priv->output_port_combo =
-                        create_port_combo_box (dialog,
-                                               port_switch,
-                                               _("Co_nnector:"),
-                                               options,
-                                               active_name);
+                        gvc_combo_box_new (port_switch, _("Co_nnector:"));
+
+                gvc_combo_box_set_size_group (GVC_COMBO_BOX (dialog->priv->output_port_combo),
+                                              dialog->priv->size_group,
+                                              FALSE);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                                     dialog->priv->output_port_combo,
@@ -578,21 +503,12 @@ update_input_settings (GvcMixerDialog *dialog)
         /* Enable the port selector if the stream has one */
         port_switch = find_stream_port_switch (stream);
         if (port_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
-
-                options = mate_mixer_switch_list_options (port_switch);
-                active  = mate_mixer_switch_get_active_option (port_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
-
                 dialog->priv->input_port_combo =
-                        create_port_combo_box (dialog,
-                                               port_switch,
-                                               _("Co_nnector:"),
-                                               options,
-                                               active_name);
+                        gvc_combo_box_new (port_switch, _("Co_nnector:"));
+
+                gvc_combo_box_set_size_group (GVC_COMBO_BOX (dialog->priv->input_port_combo),
+                                              dialog->priv->size_group,
+                                              FALSE);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->input_settings_box),
                                     dialog->priv->input_port_combo,
@@ -702,55 +618,6 @@ on_context_default_input_stream_notify (MateMixerContext *context,
         set_input_stream (dialog, stream);
 }
 
-static GvcComboBox *
-find_combo_box_by_switch (GvcMixerDialog *dialog, MateMixerSwitch *swtch)
-{
-        MateMixerSwitch *combo_switch;
-
-        if (dialog->priv->output_port_combo != NULL) {
-                combo_switch = g_object_get_data (G_OBJECT (dialog->priv->output_port_combo),
-                                                  "switch");
-                if (combo_switch == swtch)
-                        return GVC_COMBO_BOX (dialog->priv->output_port_combo);
-        }
-
-        if (dialog->priv->input_port_combo != NULL) {
-                combo_switch = g_object_get_data (G_OBJECT (dialog->priv->input_port_combo),
-                                                  "switch");
-                if (combo_switch == swtch)
-                        return GVC_COMBO_BOX (dialog->priv->input_port_combo);
-        }
-        return NULL;
-}
-
-static void
-on_switch_option_notify (MateMixerSwitch *swtch,
-                         GParamSpec      *pspec,
-                         GvcMixerDialog  *dialog)
-{
-        GvcComboBox           *combobox;
-        MateMixerSwitchOption *port;
-
-        combobox = find_combo_box_by_switch (dialog, swtch);
-        if (G_UNLIKELY (combobox == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        g_signal_handlers_block_by_func (G_OBJECT (combobox),
-                                         on_combobox_option_changed,
-                                         dialog);
-
-        port = mate_mixer_switch_get_active_option (swtch);
-        if (G_LIKELY (port != NULL))
-                gvc_combo_box_set_active (GVC_COMBO_BOX (combobox),
-                                          mate_mixer_switch_option_get_name (port));
-
-        g_signal_handlers_unblock_by_func (G_OBJECT (combobox),
-                                           on_combobox_option_changed,
-                                           dialog);
-}
-
 static GtkWidget *
 create_bar (GvcMixerDialog *dialog, gboolean use_size_group, gboolean symmetric)
 {
@@ -779,19 +646,9 @@ bar_set_stream (GvcMixerDialog  *dialog,
 {
         MateMixerStreamControl *control = NULL;
 
-        if (stream != NULL) {
-                MateMixerSwitch *port_switch;
-
+        if (stream != NULL)
                 control = mate_mixer_stream_get_default_control (stream);
 
-                port_switch = find_stream_port_switch (stream);
-                if (port_switch != NULL)
-                        g_signal_connect (G_OBJECT (port_switch),
-                                          "notify::active-option",
-                                          G_CALLBACK (on_switch_option_notify),
-                                          dialog);
-        }
-
         bar_set_stream_control (dialog, bar, control);
 }
 
@@ -1037,7 +894,7 @@ add_stream (GvcMixerDialog *dialog, MateMixerStream *stream)
 
                 control = mate_mixer_stream_get_default_control (stream);
                 if (G_LIKELY (control != NULL))
-                        speakers = mvc_channel_map_to_pretty_string (control);
+                        speakers = gvc_channel_map_to_pretty_string (control);
         }
 
         controls = mate_mixer_stream_list_controls (stream);
@@ -1367,30 +1224,15 @@ update_device_info (GvcMixerDialog *dialog, MateMixerDevice *device)
 }
 
 static void
-on_device_profile_notify (MateMixerSwitch *swtch,
-                          GParamSpec      *pspec,
-                          GvcMixerDialog  *dialog)
+on_device_profile_active_option_notify (MateMixerDeviceSwitch *swtch,
+                                        GParamSpec            *pspec,
+                                        GvcMixerDialog        *dialog)
 {
-        MateMixerSwitchOption *active;
-
-        g_signal_handlers_block_by_func (G_OBJECT (dialog->priv->hw_profile_combo),
-                                         G_CALLBACK (on_combobox_option_changed),
-                                         dialog);
-
-        active = mate_mixer_switch_get_active_option (swtch);
-        if (G_LIKELY (active != NULL)) {
-                const gchar *name = mate_mixer_switch_option_get_name (active);
-
-                gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->hw_profile_combo),
-                                          name);
-        }
+        MateMixerDevice *device;
 
-        g_signal_handlers_unblock_by_func (G_OBJECT (dialog->priv->hw_profile_combo),
-                                           G_CALLBACK (on_combobox_option_changed),
-                                           dialog);
+        device = mate_mixer_device_switch_get_device (swtch);
 
-        // XXX find device
-        // update_device_info (dialog, device);
+        update_device_info (dialog, device);
 }
 
 static void
@@ -1426,9 +1268,9 @@ add_device (GvcMixerDialog *dialog, MateMixerDevice *device)
                 if (G_LIKELY (active != NULL))
                         profile_label = mate_mixer_switch_option_get_label (active);
 
-                g_signal_connect (G_OBJECT (device),
+                g_signal_connect (G_OBJECT (profile_switch),
                                   "notify::active-option",
-                                  G_CALLBACK (on_device_profile_notify),
+                                  G_CALLBACK (on_device_profile_active_option_notify),
                                   dialog);
         }
 
@@ -1705,6 +1547,15 @@ create_stream_treeview (GvcMixerDialog *dialog, GCallback on_toggled)
 }
 
 static void
+on_device_profile_changing (GvcComboBox           *combobox,
+                            MateMixerSwitchOption *option,
+                            GvcMixerDialog        *dialog)
+{
+        g_debug ("Changing device profile");
+        // TODO
+}
+
+static void
 on_test_speakers_clicked (GvcComboBox *widget, GvcMixerDialog *dialog)
 {
         GtkWidget       *d,
@@ -1750,46 +1601,6 @@ on_test_speakers_clicked (GvcComboBox *widget, GvcMixerDialog *dialog)
         gtk_widget_destroy (d);
 }
 
-static GtkWidget *
-create_profile_combo_box (GvcMixerDialog  *dialog,
-                          MateMixerSwitch *swtch,
-                          const gchar     *name,
-                          const GList     *items,
-                          const gchar     *active)
-{
-        GtkWidget *combobox;
-
-        combobox = gvc_combo_box_new (name);
-
-        gvc_combo_box_set_options (GVC_COMBO_BOX (combobox), items);
-        gvc_combo_box_set_active (GVC_COMBO_BOX (combobox), active);
-
-        gvc_combo_box_set_size_group (GVC_COMBO_BOX (combobox),
-                                      dialog->priv->size_group,
-                                      FALSE);
-
-        g_object_set (G_OBJECT (combobox),
-                      "button-label", _("Test Speakers"),
-                      NULL);
-
-        g_object_set_data_full (G_OBJECT (combobox),
-                                "switch",
-                                g_object_ref (swtch),
-                                g_object_unref);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "changed",
-                          G_CALLBACK (on_combobox_option_changed),
-                          dialog);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "button-clicked",
-                          G_CALLBACK (on_test_speakers_clicked),
-                          dialog);
-
-        return combobox;
-}
-
 static void
 on_device_selection_changed (GtkTreeSelection *selection, GvcMixerDialog *dialog)
 {
@@ -1826,26 +1637,27 @@ on_device_selection_changed (GtkTreeSelection *selection, GvcMixerDialog *dialog
         /* Profile/speaker test combo */
         profile_switch = find_device_profile_switch (device);
         if (profile_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
+                dialog->priv->hw_profile_combo =
+                        gvc_combo_box_new (profile_switch, _("_Profile:"));
 
-                options = mate_mixer_switch_list_options (profile_switch);
-                active  = mate_mixer_switch_get_active_option (profile_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
+                g_object_set (G_OBJECT (dialog->priv->hw_profile_combo),
+                              "button-label", _("Test Speakers"),
+                              NULL);
 
-                dialog->priv->hw_profile_combo =
-                        create_profile_combo_box (dialog,
-                                                  profile_switch,
-                                                  _("_Profile:"),
-                                                  options,
-                                                  active_name);
+                g_signal_connect (G_OBJECT (dialog->priv->hw_profile_combo),
+                                  "changing",
+                                  G_CALLBACK (on_device_profile_changing),
+                                  dialog);
+
+                g_signal_connect (G_OBJECT (dialog->priv->hw_profile_combo),
+                                  "button-clicked",
+                                  G_CALLBACK (on_test_speakers_clicked),
+                                  dialog);
 
                 g_object_set_data_full (G_OBJECT (dialog->priv->hw_profile_combo),
-                                   "device",
-                                   g_object_ref (device),
-                                   g_object_unref);
+                                        "device",
+                                        g_object_ref (device),
+                                        g_object_unref);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->hw_settings_box),
                                     dialog->priv->hw_profile_combo,
diff --git a/mate-volume-control/src/gvc-mixer-dialog.h b/mate-volume-control/gvc-mixer-dialog.h
index 22e522d..22e522d 100644
--- a/mate-volume-control/src/gvc-mixer-dialog.h
+++ b/mate-volume-control/gvc-mixer-dialog.h
diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
new file mode 100644
index 0000000..4d7337c
--- /dev/null
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
@@ -0,0 +1,1149 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Bastien Nocera <[email protected]>
+ * Copyright (C) 2008 William Jon McCann
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <utime.h>
+#include <errno.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <canberra-gtk.h>
+#include <libxml/tree.h>
+
+#include "gvc-sound-theme-chooser.h"
+#include "sound-theme-file-utils.h"
+
+#define GVC_SOUND_THEME_CHOOSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_SOUND_THEME_CHOOSER, GvcSoundThemeChooserPrivate))
+
+struct GvcSoundThemeChooserPrivate
+{
+        GtkWidget *combo_box;
+        GtkWidget *treeview;
+        GtkWidget *theme_box;
+        GtkWidget *selection_box;
+        GtkWidget *click_feedback_button;
+        GSettings *sound_settings;
+};
+
+static void     gvc_sound_theme_chooser_class_init (GvcSoundThemeChooserClass *klass);
+static void     gvc_sound_theme_chooser_init       (GvcSoundThemeChooser      *sound_theme_chooser);
+static void     gvc_sound_theme_chooser_dispose   (GObject            *object);
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_BOX)
+#else
+G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_VBOX)
+#endif
+
+#define KEY_SOUNDS_SCHEMA          "org.mate.sound"
+#define EVENT_SOUNDS_KEY           "event-sounds"
+#define INPUT_SOUNDS_KEY           "input-feedback-sounds"
+#define SOUND_THEME_KEY            "theme-name"
+
+#define DEFAULT_ALERT_ID        "__default"
+#define CUSTOM_THEME_NAME       "__custom"
+#define NO_SOUNDS_THEME_NAME    "__no_sounds"
+
+enum {
+        THEME_DISPLAY_COL,
+        THEME_IDENTIFIER_COL,
+        THEME_PARENT_ID_COL,
+        THEME_NUM_COLS
+};
+
+enum {
+        ALERT_DISPLAY_COL,
+        ALERT_IDENTIFIER_COL,
+        ALERT_SOUND_TYPE_COL,
+        ALERT_ACTIVE_COL,
+        ALERT_NUM_COLS
+};
+
+enum {
+        SOUND_TYPE_UNSET,
+        SOUND_TYPE_OFF,
+        SOUND_TYPE_DEFAULT_FROM_THEME,
+        SOUND_TYPE_BUILTIN,
+        SOUND_TYPE_CUSTOM
+};
+
+static void
+on_combobox_changed (GtkComboBox          *widget,
+                     GvcSoundThemeChooser *chooser)
+{
+        GtkTreeIter   iter;
+        GtkTreeModel *model;
+        char         *theme_name;
+
+        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser->priv->combo_box), &iter) == FALSE) {
+                return;
+        }
+
+        model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser->priv->combo_box));
+        gtk_tree_model_get (model, &iter, THEME_IDENTIFIER_COL, &theme_name, -1);
+
+        g_assert (theme_name != NULL);
+
+        /* It is necessary to update the theme name before any other setting as
+         * the "changed" notification will reload the contents of the widget */
+        g_settings_set_string (chooser->priv->sound_settings, SOUND_THEME_KEY, theme_name);
+
+        /* special case for no sounds */
+        if (strcmp (theme_name, NO_SOUNDS_THEME_NAME) == 0) {
+                g_settings_set_boolean (chooser->priv->sound_settings, EVENT_SOUNDS_KEY, FALSE);
+                return;
+        } else {
+                g_settings_set_boolean (chooser->priv->sound_settings, EVENT_SOUNDS_KEY, TRUE);
+        }
+
+        g_free (theme_name);
+
+        /* FIXME: reset alert model */
+}
+
+static char *
+load_index_theme_name (const char *index,
+                       char      **parent)
+{
+        GKeyFile *file;
+        char *indexname = NULL;
+        gboolean hidden;
+
+        file = g_key_file_new ();
+        if (g_key_file_load_from_file (file, index, G_KEY_FILE_KEEP_TRANSLATIONS, NULL) == FALSE) {
+                g_key_file_free (file);
+                return NULL;
+        }
+        /* Don't add hidden themes to the list */
+        hidden = g_key_file_get_boolean (file, "Sound Theme", "Hidden", NULL);
+        if (!hidden) {
+                indexname = g_key_file_get_locale_string (file,
+                                                          "Sound Theme",
+                                                          "Name",
+                                                          NULL,
+                                                          NULL);
+
+                /* Save the parent theme, if there's one */
+                if (parent != NULL) {
+                        *parent = g_key_file_get_string (file,
+                                                         "Sound Theme",
+                                                         "Inherits",
+                                                         NULL);
+                }
+        }
+
+        g_key_file_free (file);
+        return indexname;
+}
+
+static void
+sound_theme_in_dir (GHashTable *hash,
+                    const char *dir)
+{
+        GDir *d;
+        const char *name;
+
+        d = g_dir_open (dir, 0, NULL);
+        if (d == NULL) {
+                return;
+        }
+
+        while ((name = g_dir_read_name (d)) != NULL) {
+                char *dirname, *index, *indexname;
+
+                /* Look for directories */
+                dirname = g_build_filename (dir, name, NULL);
+                if (g_file_test (dirname, G_FILE_TEST_IS_DIR) == FALSE) {
+                        g_free (dirname);
+                        continue;
+                }
+
+                /* Look for index files */
+                index = g_build_filename (dirname, "index.theme", NULL);
+                g_free (dirname);
+
+                /* Check the name of the theme in the index.theme file */
+                indexname = load_index_theme_name (index, NULL);
+                g_free (index);
+                if (indexname == NULL) {
+                        continue;
+                }
+
+                g_hash_table_insert (hash, g_strdup (name), indexname);
+        }
+
+        g_dir_close (d);
+}
+
+static void
+add_theme_to_store (const char   *key,
+                    const char   *value,
+                    GtkListStore *store)
+{
+        char *parent;
+
+        parent = NULL;
+
+        /* Get the parent, if we're checking the custom theme */
+        if (strcmp (key, CUSTOM_THEME_NAME) == 0) {
+                char *name, *path;
+
+                path = custom_theme_dir_path ("index.theme");
+                name = load_index_theme_name (path, &parent);
+                g_free (name);
+                g_free (path);
+        }
+        gtk_list_store_insert_with_values (store, NULL, G_MAXINT,
+                                           THEME_DISPLAY_COL, value,
+                                           THEME_IDENTIFIER_COL, key,
+                                           THEME_PARENT_ID_COL, parent,
+                                           -1);
+        g_free (parent);
+}
+
+static void
+set_combox_for_theme_name (GvcSoundThemeChooser *chooser,
+                           const char           *name)
+{
+        GtkTreeIter   iter;
+        GtkTreeModel *model;
+        gboolean      found;
+
+        /* If the name is empty, use "freedesktop" */
+        if (name == NULL || *name == '\0') {
+                name = "freedesktop";
+        }
+
+        model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser->priv->combo_box));
+
+        if (gtk_tree_model_get_iter_first (model, &iter) == FALSE) {
+                return;
+        }
+
+        do {
+                char *value;
+
+                gtk_tree_model_get (model, &iter, THEME_IDENTIFIER_COL, &value, -1);
+                found = (value != NULL && strcmp (value, name) == 0);
+                g_free (value);
+
+        } while (!found && gtk_tree_model_iter_next (model, &iter));
+
+        /* When we can't find the theme we need to set, try to set the default
+         * one "freedesktop" */
+        if (found) {
+                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser->priv->combo_box), &iter);
+        } else if (strcmp (name, "freedesktop") != 0) {
+                g_debug ("not found, falling back to fdo");
+                set_combox_for_theme_name (chooser, "freedesktop");
+        }
+}
+
+static void
+set_input_feedback_enabled (GvcSoundThemeChooser *chooser,
+                            gboolean              enabled)
+{
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser->priv->click_feedback_button),
+                                      enabled);
+}
+
+static void
+setup_theme_selector (GvcSoundThemeChooser *chooser)
+{
+        GHashTable           *hash;
+        GtkListStore         *store;
+        GtkCellRenderer      *renderer;
+        const char * const   *data_dirs;
+        const char           *data_dir;
+        char                 *dir;
+        guint                 i;
+
+        /* Add the theme names and their display name to a hash table,
+         * makes it easy to avoid duplicate themes */
+        hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+        data_dirs = g_get_system_data_dirs ();
+        for (i = 0; data_dirs[i] != NULL; i++) {
+                dir = g_build_filename (data_dirs[i], "sounds", NULL);
+                sound_theme_in_dir (hash, dir);
+                g_free (dir);
+        }
+
+        data_dir = g_get_user_data_dir ();
+        dir = g_build_filename (data_dir, "sounds", NULL);
+        sound_theme_in_dir (hash, dir);
+        g_free (dir);
+
+        /* If there isn't at least one theme, make everything
+         * insensitive, LAME! */
+        if (g_hash_table_size (hash) == 0) {
+                gtk_widget_set_sensitive (GTK_WIDGET (chooser), FALSE);
+                g_warning ("Bad setup, install the freedesktop sound theme");
+                g_hash_table_destroy (hash);
+                return;
+        }
+
+        /* Setup the tree model, 3 columns:
+         * - internal theme name/directory
+         * - display theme name
+         * - the internal id for the parent theme, used for the custom theme */
+        store = gtk_list_store_new (THEME_NUM_COLS,
+                                    G_TYPE_STRING,
+                                    G_TYPE_STRING,
+                                    G_TYPE_STRING);
+
+        /* Add the themes to a combobox */
+        gtk_list_store_insert_with_values (store,
+                                           NULL,
+                                           G_MAXINT,
+                                           THEME_DISPLAY_COL, _("No sounds"),
+                                           THEME_IDENTIFIER_COL, "__no_sounds",
+                                           THEME_PARENT_ID_COL, NULL,
+                                           -1);
+        g_hash_table_foreach (hash, (GHFunc) add_theme_to_store, store);
+        g_hash_table_destroy (hash);
+
+        /* Set the display */
+        gtk_combo_box_set_model (GTK_COMBO_BOX (chooser->priv->combo_box),
+                                 GTK_TREE_MODEL (store));
+
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser->priv->combo_box),
+                                    renderer,
+                                    TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser->priv->combo_box),
+                                        renderer,
+                                        "text", THEME_DISPLAY_COL,
+                                        NULL);
+
+        g_signal_connect (G_OBJECT (chooser->priv->combo_box),
+                          "changed",
+                          G_CALLBACK (on_combobox_changed),
+                          chooser);
+}
+
+#define GVC_SOUND_SOUND    (xmlChar *) "sound"
+#define GVC_SOUND_NAME     (xmlChar *) "name"
+#define GVC_SOUND_FILENAME (xmlChar *) "filename"
+
+/* Adapted from yelp-toc-pager.c */
+static xmlChar *
+xml_get_and_trim_names (xmlNodePtr node)
+{
+        xmlNodePtr cur, keep = NULL;
+        xmlChar *keep_lang = NULL;
+        xmlChar *value;
+        int j, keep_pri = INT_MAX;
+
+        const gchar * const * langs = g_get_language_names ();
+
+        value = NULL;
+
+        for (cur = node->children; cur; cur = cur->next) {
+                if (! xmlStrcmp (cur->name, GVC_SOUND_NAME)) {
+                        xmlChar *cur_lang = NULL;
+                        int cur_pri = INT_MAX;
+
+                        cur_lang = xmlNodeGetLang (cur);
+
+                        if (cur_lang) {
+                                for (j = 0; langs[j]; j++) {
+                                        if (g_str_equal (cur_lang, langs[j])) {
+                                                cur_pri = j;
+                                                break;
+                                        }
+                                }
+                        } else {
+                                cur_pri = INT_MAX - 1;
+                        }
+
+                        if (cur_pri <= keep_pri) {
+                                if (keep_lang)
+                                        xmlFree (keep_lang);
+                                if (value)
+                                        xmlFree (value);
+
+                                value = xmlNodeGetContent (cur);
+
+                                keep_lang = cur_lang;
+                                keep_pri = cur_pri;
+                                keep = cur;
+                        } else {
+                                if (cur_lang)
+                                        xmlFree (cur_lang);
+                        }
+                }
+        }
+
+        /* Delete all GVC_SOUND_NAME nodes */
+        cur = node->children;
+        while (cur) {
+                xmlNodePtr this = cur;
+                cur = cur->next;
+                if (! xmlStrcmp (this->name, GVC_SOUND_NAME)) {
+                        xmlUnlinkNode (this);
+                        xmlFreeNode (this);
+                }
+        }
+
+        return value;
+}
+
+static void
+populate_model_from_node (GvcSoundThemeChooser *chooser,
+                          GtkTreeModel         *model,
+                          xmlNodePtr            node)
+{
+        xmlNodePtr child;
+        xmlChar   *filename;
+        xmlChar   *name;
+
+        filename = NULL;
+        name = xml_get_and_trim_names (node);
+        for (child = node->children; child; child = child->next) {
+                if (xmlNodeIsText (child)) {
+                        continue;
+                }
+
+                if (xmlStrcmp (child->name, GVC_SOUND_FILENAME) == 0) {
+                        filename = xmlNodeGetContent (child);
+                } else if (xmlStrcmp (child->name, GVC_SOUND_NAME) == 0) {
+                        /* EH? should have been trimmed */
+                }
+        }
+
+        if (filename != NULL && name != NULL) {
+                gtk_list_store_insert_with_values (GTK_LIST_STORE (model),
+                                                   NULL,
+                                                   G_MAXINT,
+                                                   ALERT_IDENTIFIER_COL, filename,
+                                                   ALERT_DISPLAY_COL, name,
+                                                   ALERT_SOUND_TYPE_COL, _("Built-in"),
+                                                   ALERT_ACTIVE_COL, FALSE,
+                                                   -1);
+        }
+
+        xmlFree (filename);
+        xmlFree (name);
+}
+
+static void
+populate_model_from_file (GvcSoundThemeChooser *chooser,
+                          GtkTreeModel         *model,
+                          const char           *filename)
+{
+        xmlDocPtr  doc;
+        xmlNodePtr root;
+        xmlNodePtr child;
+        gboolean   exists;
+
+        exists = g_file_test (filename, G_FILE_TEST_EXISTS);
+        if (! exists) {
+                return;
+        }
+
+        doc = xmlParseFile (filename);
+        if (doc == NULL) {
+                return;
+        }
+
+        root = xmlDocGetRootElement (doc);
+
+        for (child = root->children; child; child = child->next) {
+                if (xmlNodeIsText (child)) {
+                        continue;
+                }
+                if (xmlStrcmp (child->name, GVC_SOUND_SOUND) != 0) {
+                        continue;
+                }
+
+                populate_model_from_node (chooser, model, child);
+        }
+
+        xmlFreeDoc (doc);
+}
+
+static void
+populate_model_from_dir (GvcSoundThemeChooser *chooser,
+                         GtkTreeModel         *model,
+                         const char           *dirname)
+{
+        GDir       *d;
+        const char *name;
+
+        d = g_dir_open (dirname, 0, NULL);
+        if (d == NULL) {
+                return;
+        }
+
+        while ((name = g_dir_read_name (d)) != NULL) {
+                char *path;
+
+                if (! g_str_has_suffix (name, ".xml")) {
+                        continue;
+                }
+
+                path = g_build_filename (dirname, name, NULL);
+                populate_model_from_file (chooser, model, path);
+                g_free (path);
+        }
+
+        g_dir_close (d);
+}
+
+static gboolean
+save_alert_sounds (GvcSoundThemeChooser  *chooser,
+                   const char            *id)
+{
+        const char *sounds[3] = { "bell-terminal", "bell-window-system", NULL };
+        char *path;
+
+        if (strcmp (id, DEFAULT_ALERT_ID) == 0) {
+                delete_old_files (sounds);
+                delete_disabled_files (sounds);
+        } else {
+                delete_old_files (sounds);
+                delete_disabled_files (sounds);
+                add_custom_file (sounds, id);
+        }
+
+        /* And poke the directory so the theme gets updated */
+        path = custom_theme_dir_path (NULL);
+        if (utime (path, NULL) != 0) {
+                g_warning ("Failed to update mtime for directory '%s': %s",
+                           path, g_strerror (errno));
+        }
+        g_free (path);
+
+        return FALSE;
+}
+
+
+static void
+update_alert_model (GvcSoundThemeChooser  *chooser,
+                    const char            *id)
+{
+        GtkTreeModel *model;
+        GtkTreeIter   iter;
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (chooser->priv->treeview));
+        gtk_tree_model_get_iter_first (model, &iter);
+        do {
+                gboolean toggled;
+                char    *this_id;
+
+                gtk_tree_model_get (model, &iter,
+                                    ALERT_IDENTIFIER_COL, &this_id,
+                                    -1);
+
+                if (strcmp (this_id, id) == 0) {
+                        toggled = TRUE;
+                } else {
+                        toggled = FALSE;
+                }
+                g_free (this_id);
+
+                gtk_list_store_set (GTK_LIST_STORE (model),
+                                    &iter,
+                                    ALERT_ACTIVE_COL, toggled,
+                                    -1);
+        } while (gtk_tree_model_iter_next (model, &iter));
+}
+
+static void
+update_alert (GvcSoundThemeChooser *chooser,
+              const char           *alert_id)
+{
+        GtkTreeModel *theme_model;
+        GtkTreeIter   iter;
+        char         *theme;
+        char         *parent;
+        gboolean      is_custom;
+        gboolean      is_default;
+        gboolean      add_custom;
+        gboolean      remove_custom;
+
+        theme_model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser->priv->combo_box));
+        /* Get the current theme's name, and set the parent */
+        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser->priv->combo_box), &iter) == FALSE) {
+                return;
+        }
+
+        gtk_tree_model_get (theme_model, &iter,
+                            THEME_IDENTIFIER_COL, &theme,
+                            THEME_IDENTIFIER_COL, &parent,
+                            -1);
+        is_custom = strcmp (theme, CUSTOM_THEME_NAME) == 0;
+        is_default = strcmp (alert_id, DEFAULT_ALERT_ID) == 0;
+
+        /* So a few possibilities:
+         * 1. Named theme, default alert selected: noop
+         * 2. Named theme, alternate alert selected: create new custom with sound
+         * 3. Custom theme, default alert selected: remove sound and possibly custom
+         * 4. Custom theme, alternate alert selected: update custom sound
+         */
+        add_custom = FALSE;
+        remove_custom = FALSE;
+        if (! is_custom && is_default) {
+                /* remove custom just in case */
+                remove_custom = TRUE;
+        } else if (! is_custom && ! is_default) {
+                create_custom_theme (parent);
+                save_alert_sounds (chooser, alert_id);
+                add_custom = TRUE;
+        } else if (is_custom && is_default) {
+                save_alert_sounds (chooser, alert_id);
+                /* after removing files check if it is empty */
+                if (custom_theme_dir_is_empty ()) {
+                        remove_custom = TRUE;
+                }
+        } else if (is_custom && ! is_default) {
+                save_alert_sounds (chooser, alert_id);
+        }
+
+        if (add_custom) {
+                gtk_list_store_insert_with_values (GTK_LIST_STORE (theme_model),
+                                                   NULL,
+                                                   G_MAXINT,
+                                                   THEME_DISPLAY_COL, _("Custom"),
+                                                   THEME_IDENTIFIER_COL, CUSTOM_THEME_NAME,
+                                                   THEME_PARENT_ID_COL, theme,
+                                                   -1);
+                set_combox_for_theme_name (chooser, CUSTOM_THEME_NAME);
+        } else if (remove_custom) {
+                gtk_tree_model_get_iter_first (theme_model, &iter);
+                do {
+                        char *this_parent;
+
+                        gtk_tree_model_get (theme_model, &iter,
+                                            THEME_PARENT_ID_COL, &this_parent,
+                                            -1);
+                        if (this_parent != NULL && strcmp (this_parent, CUSTOM_THEME_NAME) != 0) {
+                                g_free (this_parent);
+                                gtk_list_store_remove (GTK_LIST_STORE (theme_model), &iter);
+                                break;
+                        }
+                        g_free (this_parent);
+                } while (gtk_tree_model_iter_next (theme_model, &iter));
+
+                delete_custom_theme_dir ();
+
+                set_combox_for_theme_name (chooser, parent);
+        }
+
+        update_alert_model (chooser, alert_id);
+
+        g_free (theme);
+        g_free (parent);
+}
+
+static void
+on_alert_toggled (GtkCellRendererToggle *renderer,
+                  char                  *path_str,
+                  GvcSoundThemeChooser  *chooser)
+{
+        GtkTreeModel *model;
+        GtkTreeIter   iter;
+        GtkTreePath  *path;
+        gboolean      toggled;
+        char         *id;
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (chooser->priv->treeview));
+
+        path = gtk_tree_path_new_from_string (path_str);
+        gtk_tree_model_get_iter (model, &iter, path);
+        gtk_tree_path_free (path);
+
+        id = NULL;
+        gtk_tree_model_get (model, &iter,
+                            ALERT_IDENTIFIER_COL, &id,
+                            ALERT_ACTIVE_COL, &toggled,
+                            -1);
+
+        toggled ^= 1;
+        if (toggled) {
+                update_alert (chooser, id);
+        }
+
+        g_free (id);
+}
+
+static void
+play_preview_for_path (GvcSoundThemeChooser *chooser, GtkTreePath *path)
+{
+        GtkTreeModel *model;
+        GtkTreeIter   iter;
+        GtkTreeIter   theme_iter;
+        gchar        *id = NULL;
+        gchar        *parent_theme = NULL;
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (chooser->priv->treeview));
+        if (gtk_tree_model_get_iter (model, &iter, path) == FALSE)
+                return;
+
+        gtk_tree_model_get (model, &iter,
+                            ALERT_IDENTIFIER_COL, &id,
+                            -1);
+        if (id == NULL)
+                return;
+
+        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser->priv->combo_box), &theme_iter)) {
+                GtkTreeModel *theme_model;
+                gchar        *theme_id = NULL;
+                gchar        *parent_id = NULL;
+
+                theme_model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser->priv->combo_box));
+
+                gtk_tree_model_get (theme_model, &theme_iter,
+                                    THEME_IDENTIFIER_COL, &theme_id,
+                                    THEME_PARENT_ID_COL, &parent_id, -1);
+                if (theme_id && strcmp (theme_id, CUSTOM_THEME_NAME) == 0)
+                        parent_theme = g_strdup (parent_id);
+
+                g_free (theme_id);
+                g_free (parent_id);
+        }
+
+        /* special case: for the default item on custom themes
+         * play the alert for the parent theme */
+        if (strcmp (id, DEFAULT_ALERT_ID) == 0) {
+                if (parent_theme != NULL) {
+                        ca_gtk_play_for_widget (GTK_WIDGET (chooser), 0,
+                                                CA_PROP_APPLICATION_NAME, _("Sound Preferences"),
+                                                CA_PROP_EVENT_ID, "bell-window-system",
+                                                CA_PROP_CANBERRA_XDG_THEME_NAME, parent_theme,
+                                                CA_PROP_EVENT_DESCRIPTION, _("Testing event sound"),
+                                                CA_PROP_CANBERRA_CACHE_CONTROL, "never",
+                                                CA_PROP_APPLICATION_ID, "org.mate.VolumeControl",
+#ifdef CA_PROP_CANBERRA_ENABLE
+                                                CA_PROP_CANBERRA_ENABLE, "1",
+#endif
+                                                NULL);
+                } else {
+                        ca_gtk_play_for_widget (GTK_WIDGET (chooser), 0,
+                                                CA_PROP_APPLICATION_NAME, _("Sound Preferences"),
+                                                CA_PROP_EVENT_ID, "bell-window-system",
+                                                CA_PROP_EVENT_DESCRIPTION, _("Testing event sound"),
+                                                CA_PROP_CANBERRA_CACHE_CONTROL, "never",
+                                                CA_PROP_APPLICATION_ID, "org.mate.VolumeControl",
+#ifdef CA_PROP_CANBERRA_ENABLE
+                                                CA_PROP_CANBERRA_ENABLE, "1",
+#endif
+                                                NULL);
+                }
+        } else {
+                ca_gtk_play_for_widget (GTK_WIDGET (chooser), 0,
+                                        CA_PROP_APPLICATION_NAME, _("Sound Preferences"),
+                                        CA_PROP_MEDIA_FILENAME, id,
+                                        CA_PROP_EVENT_DESCRIPTION, _("Testing event sound"),
+                                        CA_PROP_CANBERRA_CACHE_CONTROL, "never",
+                                        CA_PROP_APPLICATION_ID, "org.mate.VolumeControl",
+#ifdef CA_PROP_CANBERRA_ENABLE
+                                        CA_PROP_CANBERRA_ENABLE, "1",
+#endif
+                                        NULL);
+
+        }
+        g_free (parent_theme);
+        g_free (id);
+}
+
+static void
+on_treeview_row_activated (GtkTreeView          *treeview,
+                           GtkTreePath          *path,
+                           GtkTreeViewColumn    *column,
+                           GvcSoundThemeChooser *chooser)
+{
+        play_preview_for_path (chooser, path);
+}
+
+static void
+on_treeview_selection_changed (GtkTreeSelection     *selection,
+                               GvcSoundThemeChooser *chooser)
+{
+        GList        *paths;
+        GtkTreeModel *model;
+        GtkTreePath  *path;
+
+        if (chooser->priv->treeview == NULL)
+                return;
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (chooser->priv->treeview));
+
+        paths = gtk_tree_selection_get_selected_rows (selection, &model);
+        if (paths == NULL)
+                return;
+
+        path = paths->data;
+        play_preview_for_path (chooser, path);
+
+        g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL);
+        g_list_free (paths);
+}
+
+static GtkWidget *
+create_alert_treeview (GvcSoundThemeChooser *chooser)
+{
+        GtkListStore         *store;
+        GtkWidget            *treeview;
+        GtkCellRenderer      *renderer;
+        GtkTreeViewColumn    *column;
+        GtkTreeSelection     *selection;
+
+        treeview = gtk_tree_view_new ();
+
+        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+        g_signal_connect (G_OBJECT (treeview),
+                          "row-activated",
+                          G_CALLBACK (on_treeview_row_activated),
+                          chooser);
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+
+        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+        g_signal_connect (G_OBJECT (selection),
+                          "changed",
+                          G_CALLBACK (on_treeview_selection_changed),
+                          chooser);
+
+        /* Setup the tree model, 3 columns:
+         * - display name
+         * - sound id
+         * - sound type
+         */
+        store = gtk_list_store_new (ALERT_NUM_COLS,
+                                    G_TYPE_STRING,
+                                    G_TYPE_STRING,
+                                    G_TYPE_STRING,
+                                    G_TYPE_BOOLEAN);
+
+        gtk_list_store_insert_with_values (store,
+                                           NULL,
+                                           G_MAXINT,
+                                           ALERT_IDENTIFIER_COL, DEFAULT_ALERT_ID,
+                                           ALERT_DISPLAY_COL, _("Default"),
+                                           ALERT_SOUND_TYPE_COL, _("From theme"),
+                                           ALERT_ACTIVE_COL, TRUE,
+                                           -1);
+
+        populate_model_from_dir (chooser, GTK_TREE_MODEL (store), SOUND_SET_DIR);
+
+        gtk_tree_view_set_model (GTK_TREE_VIEW (treeview),
+                                 GTK_TREE_MODEL (store));
+
+        renderer = gtk_cell_renderer_toggle_new ();
+        gtk_cell_renderer_toggle_set_radio (GTK_CELL_RENDERER_TOGGLE (renderer), TRUE);
+
+        column = gtk_tree_view_column_new_with_attributes (NULL,
+                                                           renderer,
+                                                           "active", ALERT_ACTIVE_COL,
+                                                           NULL);
+        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+        g_signal_connect (renderer,
+                          "toggled",
+                          G_CALLBACK (on_alert_toggled),
+                          chooser);
+
+        renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes (_("Name"),
+                                                           renderer,
+                                                           "text", ALERT_DISPLAY_COL,
+                                                           NULL);
+        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+
+        renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes (_("Type"),
+                                                           renderer,
+                                                           "text", ALERT_SOUND_TYPE_COL,
+                                                           NULL);
+
+        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+
+        return treeview;
+}
+
+static int
+get_file_type (const char *sound_name,
+               char      **linked_name)
+{
+        char *name, *filename;
+
+        *linked_name = NULL;
+
+        name = g_strdup_printf ("%s.disabled", sound_name);
+        filename = custom_theme_dir_path (name);
+        g_free (name);
+
+        if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) != FALSE) {
+                g_free (filename);
+                return SOUND_TYPE_OFF;
+        }
+        g_free (filename);
+
+        /* We only check for .ogg files because those are the
+         * only ones we create */
+        name = g_strdup_printf ("%s.ogg", sound_name);
+        filename = custom_theme_dir_path (name);
+        g_free (name);
+
+        if (g_file_test (filename, G_FILE_TEST_IS_SYMLINK) != FALSE) {
+                *linked_name = g_file_read_link (filename, NULL);
+                g_free (filename);
+                return SOUND_TYPE_CUSTOM;
+        }
+        g_free (filename);
+
+        return SOUND_TYPE_BUILTIN;
+}
+
+static void
+update_alerts_from_theme_name (GvcSoundThemeChooser *chooser,
+                               const gchar          *name)
+{
+        if (strcmp (name, CUSTOM_THEME_NAME) != 0) {
+                /* reset alert to default */
+                update_alert (chooser, DEFAULT_ALERT_ID);
+        } else {
+                int   sound_type;
+                char *linkname;
+
+                linkname = NULL;
+                sound_type = get_file_type ("bell-terminal", &linkname);
+                g_debug ("Found link: %s", linkname);
+                if (sound_type == SOUND_TYPE_CUSTOM) {
+                        update_alert (chooser, linkname);
+                }
+        }
+}
+
+static void
+update_theme (GvcSoundThemeChooser *chooser)
+{
+        char        *theme_name;
+        gboolean     events_enabled;
+        gboolean     feedback_enabled;
+
+        feedback_enabled = g_settings_get_boolean (chooser->priv->sound_settings, INPUT_SOUNDS_KEY);
+        set_input_feedback_enabled (chooser, feedback_enabled);
+
+        events_enabled = g_settings_get_boolean (chooser->priv->sound_settings, EVENT_SOUNDS_KEY);
+        if (events_enabled) {
+                theme_name = g_settings_get_string (chooser->priv->sound_settings, SOUND_THEME_KEY);
+        } else {
+                theme_name = g_strdup (NO_SOUNDS_THEME_NAME);
+        }
+
+        gtk_widget_set_sensitive (chooser->priv->selection_box, events_enabled);
+        gtk_widget_set_sensitive (chooser->priv->click_feedback_button, events_enabled);
+
+        set_combox_for_theme_name (chooser, theme_name);
+
+        update_alerts_from_theme_name (chooser, theme_name);
+
+        g_free (theme_name);
+}
+
+static void
+gvc_sound_theme_chooser_class_init (GvcSoundThemeChooserClass *klass)
+{
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->dispose = gvc_sound_theme_chooser_dispose;
+
+        g_type_class_add_private (klass, sizeof (GvcSoundThemeChooserPrivate));
+}
+
+static void
+on_click_feedback_toggled (GtkToggleButton      *button,
+                           GvcSoundThemeChooser *chooser)
+{
+        gboolean enabled;
+
+        enabled = gtk_toggle_button_get_active (button);
+
+        g_settings_set_boolean (chooser->priv->sound_settings, INPUT_SOUNDS_KEY, enabled);
+}
+
+static void
+on_key_changed (GSettings            *settings,
+                gchar                *key,
+                GvcSoundThemeChooser *chooser)
+{
+        if (!strcmp (key, EVENT_SOUNDS_KEY) ||
+            !strcmp (key, SOUND_THEME_KEY) ||
+            !strcmp (key, INPUT_SOUNDS_KEY))
+                update_theme (chooser);
+}
+
+#if !GTK_CHECK_VERSION (3, 0, 0)
+static void
+constrain_list_size (GtkWidget      *widget,
+                     GtkRequisition *requisition,
+                     GtkWidget      *to_size)
+{
+        GtkRequisition req;
+        int            max_height;
+
+        /* Constrain height to be the tree height up to a max */
+        max_height = (gdk_screen_get_height (gtk_widget_get_screen (widget))) / 4;
+
+        gtk_widget_size_request (to_size, &req);
+
+        requisition->height = MIN (req.height, max_height);
+}
+#endif
+
+static void
+setup_list_size_constraint (GtkWidget *widget,
+                            GtkWidget *to_size)
+{
+#if GTK_CHECK_VERSION (3, 0, 0)
+        GtkRequisition req;
+        int            max_height;
+
+        /* Constrain height to be the tree height up to a max */
+        max_height = (gdk_screen_get_height (gtk_widget_get_screen (widget))) / 4;
+
+        // XXX this doesn't work
+        gtk_widget_get_preferred_size (to_size, NULL, &req);
+
+        gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (widget),
+                                                    MIN (req.height, max_height));
+#else
+        g_signal_connect (G_OBJECT (widget),
+                          "size-request",
+                          G_CALLBACK (constrain_list_size),
+                          to_size);
+#endif
+}
+
+static void
+gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
+{
+        GtkWidget   *box;
+        GtkWidget   *label;
+        GtkWidget   *scrolled_window;
+        GtkWidget   *alignment;
+        gchar       *str;
+
+        chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+        chooser->priv->theme_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#else
+        chooser->priv->theme_box = gtk_hbox_new (FALSE, 0);
+#endif
+
+        gtk_box_pack_start (GTK_BOX (chooser),
+                            chooser->priv->theme_box, FALSE, FALSE, 0);
+
+        label = gtk_label_new_with_mnemonic (_("Sound _theme:"));
+        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 0);
+        chooser->priv->combo_box = gtk_combo_box_new ();
+        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 6);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->combo_box);
+
+        chooser->priv->sound_settings = g_settings_new (KEY_SOUNDS_SCHEMA);
+
+        str = g_strdup_printf ("<b>%s</b>", _("C_hoose an alert sound:"));
+        chooser->priv->selection_box = box = gtk_frame_new (str);
+        g_free (str);
+
+        label = gtk_frame_get_label_widget (GTK_FRAME (box));
+        gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+        gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
+
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (alignment), box);
+        gtk_box_pack_start (GTK_BOX (chooser), alignment, TRUE, TRUE, 6);
+
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (box), alignment);
+
+        chooser->priv->treeview = create_alert_treeview (chooser);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->treeview);
+
+        scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+
+        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_NEVER,
+                                        GTK_POLICY_AUTOMATIC);
+        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                             GTK_SHADOW_IN);
+
+        gtk_container_add (GTK_CONTAINER (scrolled_window), chooser->priv->treeview);
+        gtk_container_add (GTK_CONTAINER (alignment), scrolled_window);
+
+        chooser->priv->click_feedback_button = gtk_check_button_new_with_mnemonic (_("Enable _window and button sounds"));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser->priv->click_feedback_button),
+                                      g_settings_get_boolean (chooser->priv->sound_settings, INPUT_SOUNDS_KEY));
+
+        gtk_box_pack_start (GTK_BOX (chooser),
+                            chooser->priv->click_feedback_button,
+                            FALSE, FALSE, 0);
+
+        g_signal_connect (G_OBJECT (chooser->priv->click_feedback_button),
+                          "toggled",
+                          G_CALLBACK (on_click_feedback_toggled),
+                          chooser);
+        g_signal_connect (G_OBJECT (chooser->priv->sound_settings),
+                          "changed",
+                          G_CALLBACK (on_key_changed),
+                          chooser);
+
+        setup_theme_selector (chooser);
+        update_theme (chooser);
+
+        setup_list_size_constraint (scrolled_window, chooser->priv->treeview);
+}
+
+static void
+gvc_sound_theme_chooser_dispose (GObject *object)
+{
+        GvcSoundThemeChooser *chooser;
+
+        chooser = GVC_SOUND_THEME_CHOOSER (object);
+
+        g_clear_object (&chooser->priv->sound_settings);
+
+        G_OBJECT_CLASS (gvc_sound_theme_chooser_parent_class)->dispose (object);
+}
+
+GtkWidget *
+gvc_sound_theme_chooser_new (void)
+{
+        return g_object_new (GVC_TYPE_SOUND_THEME_CHOOSER,
+                                "spacing", 6,
+#if GTK_CHECK_VERSION (3, 0, 0)
+                                "orientation", GTK_ORIENTATION_VERTICAL,
+#endif
+                                NULL);
+}
diff --git a/mate-volume-control/gvc-sound-theme-chooser.h b/mate-volume-control/gvc-sound-theme-chooser.h
new file mode 100644
index 0000000..c7bfac0
--- /dev/null
+++ b/mate-volume-control/gvc-sound-theme-chooser.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __GVC_SOUND_THEME_CHOOSER_H
+#define __GVC_SOUND_THEME_CHOOSER_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GVC_TYPE_SOUND_THEME_CHOOSER         (gvc_sound_theme_chooser_get_type ())
+#define GVC_SOUND_THEME_CHOOSER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_SOUND_THEME_CHOOSER, GvcSoundThemeChooser))
+#define GVC_SOUND_THEME_CHOOSER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_SOUND_THEME_CHOOSER, GvcSoundThemeChooserClass))
+#define GVC_IS_SOUND_THEME_CHOOSER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_SOUND_THEME_CHOOSER))
+#define GVC_IS_SOUND_THEME_CHOOSER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_SOUND_THEME_CHOOSER))
+#define GVC_SOUND_THEME_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_SOUND_THEME_CHOOSER, GvcSoundThemeChooserClass))
+
+typedef struct GvcSoundThemeChooserPrivate GvcSoundThemeChooserPrivate;
+
+typedef struct
+{
+#if GTK_CHECK_VERSION (3, 0, 0)
+        GtkBox                       parent;
+#else
+        GtkVBox                      parent;
+#endif
+        GvcSoundThemeChooserPrivate *priv;
+} GvcSoundThemeChooser;
+
+typedef struct
+{
+#if GTK_CHECK_VERSION (3, 0, 0)
+        GtkBoxClass           parent_class;
+#else
+        GtkVBoxClass          parent_class;
+#endif
+} GvcSoundThemeChooserClass;
+
+GType               gvc_sound_theme_chooser_get_type            (void);
+
+GtkWidget *         gvc_sound_theme_chooser_new                 (void);
+
+G_END_DECLS
+
+#endif /* __GVC_SOUND_THEME_CHOOSER_H */
diff --git a/mate-volume-control/src/gvc-speaker-test.c b/mate-volume-control/gvc-speaker-test.c
index 0f6c9e7..e638413 100644
--- a/mate-volume-control/src/gvc-speaker-test.c
+++ b/mate-volume-control/gvc-speaker-test.c
@@ -30,7 +30,7 @@
 #include <libmatemixer/matemixer.h>
 
 #include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_SPEAKER_TEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_SPEAKER_TEST, GvcSpeakerTestPrivate))
 
@@ -316,10 +316,10 @@ on_test_button_clicked (GtkButton *button, GtkWidget *control)
                                   CA_PROP_MEDIA_ROLE, "test");
                 ca_proplist_sets (proplist,
                                   CA_PROP_MEDIA_NAME,
-                                  mvc_channel_position_to_pretty_string (position));
+                                  gvc_channel_position_to_pretty_string (position));
                 ca_proplist_sets (proplist,
                                   CA_PROP_CANBERRA_FORCE_CHANNEL,
-                                  mvc_channel_position_to_string (position));
+                                  gvc_channel_position_to_pulse_string (position));
 
                 ca_proplist_sets (proplist, CA_PROP_CANBERRA_ENABLE, "1");
 
@@ -374,7 +374,7 @@ create_control (ca_context *canberra, MateMixerChannelPosition position)
         g_object_set_data (G_OBJECT (control), "image", image);
         gtk_box_pack_start (GTK_BOX (control), image, FALSE, FALSE, 0);
 
-        label = gtk_label_new (mvc_channel_position_to_pretty_string (position));
+        label = gtk_label_new (gvc_channel_position_to_pretty_string (position));
         gtk_box_pack_start (GTK_BOX (control), label, FALSE, FALSE, 0);
 
         test_button = gtk_button_new_with_label (_("Test"));
diff --git a/mate-volume-control/src/gvc-speaker-test.h b/mate-volume-control/gvc-speaker-test.h
index 1c1546d..1c1546d 100644
--- a/mate-volume-control/src/gvc-speaker-test.h
+++ b/mate-volume-control/gvc-speaker-test.h
diff --git a/mate-volume-control/src/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c
index 3ede4b1..3ede4b1 100644
--- a/mate-volume-control/src/gvc-stream-status-icon.c
+++ b/mate-volume-control/gvc-stream-status-icon.c
diff --git a/mate-volume-control/src/gvc-stream-status-icon.h b/mate-volume-control/gvc-stream-status-icon.h
index 7b51801..7b51801 100644
--- a/mate-volume-control/src/gvc-stream-status-icon.h
+++ b/mate-volume-control/gvc-stream-status-icon.h
diff --git a/mate-volume-control/gvc-utils.c b/mate-volume-control/gvc-utils.c
new file mode 100644
index 0000000..21a583f
--- /dev/null
+++ b/mate-volume-control/gvc-utils.c
@@ -0,0 +1,158 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2014 Michal Ratajsky <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <libmatemixer/matemixer.h>
+
+#include "gvc-utils.h"
+
+/* libcanberra requires a PulseAudio channel name to be given to its
+ * CA_PROP_CANBERRA_FORCE_CHANNEL property.
+ *
+ * The strings here are copied from PulseAudio source code to avoid depending
+ * on libpulse. */
+static const gchar *pulse_position[MATE_MIXER_CHANNEL_MAX] = {
+        [MATE_MIXER_CHANNEL_MONO] = "mono",
+        [MATE_MIXER_CHANNEL_FRONT_LEFT] = "front-left",
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT] = "front-right",
+        [MATE_MIXER_CHANNEL_FRONT_CENTER] = "front-center",
+        [MATE_MIXER_CHANNEL_LFE] = "lfe",
+        [MATE_MIXER_CHANNEL_BACK_LEFT] = "rear-left",
+        [MATE_MIXER_CHANNEL_BACK_RIGHT] = "rear-right",
+        [MATE_MIXER_CHANNEL_BACK_CENTER] = "rear-center",
+        [MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER] = "front-left-of-center",
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER] = "front-right-of-center",
+        [MATE_MIXER_CHANNEL_SIDE_LEFT] = "side-left",
+        [MATE_MIXER_CHANNEL_SIDE_RIGHT] = "side-right",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_LEFT] = "top-front-left",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT] = "top-front-right",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_CENTER] = "top-front-center",
+        [MATE_MIXER_CHANNEL_TOP_CENTER] = "top-center",
+        [MATE_MIXER_CHANNEL_TOP_BACK_LEFT] = "top-rear-left",
+        [MATE_MIXER_CHANNEL_TOP_BACK_RIGHT] = "top-rear-right",
+        [MATE_MIXER_CHANNEL_TOP_BACK_CENTER] = "top-rear-center"
+};
+
+static const gchar *pretty_position[MATE_MIXER_CHANNEL_MAX] = {
+        [MATE_MIXER_CHANNEL_UNKNOWN] = N_("Unknown"),
+        /* Speaker channel names */
+        [MATE_MIXER_CHANNEL_MONO] = N_("Mono"),
+        [MATE_MIXER_CHANNEL_FRONT_LEFT] = N_("Front Left"),
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT] = N_("Front Right"),
+        [MATE_MIXER_CHANNEL_FRONT_CENTER] = N_("Front Center"),
+        [MATE_MIXER_CHANNEL_LFE] = N_("LFE"),
+        [MATE_MIXER_CHANNEL_BACK_LEFT] = N_("Rear Left"),
+        [MATE_MIXER_CHANNEL_BACK_RIGHT] = N_("Rear Right"),
+        [MATE_MIXER_CHANNEL_BACK_CENTER] = N_("Rear Center"),
+        [MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER] = N_("Front Left of Center"),
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER] = N_("Front Right of Center"),
+        [MATE_MIXER_CHANNEL_SIDE_LEFT] = N_("Side Left"),
+        [MATE_MIXER_CHANNEL_SIDE_RIGHT] = N_("Side Right"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_LEFT] = N_("Top Front Left"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT] = N_("Top Front Right"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_CENTER] = N_("Top Front Center"),
+        [MATE_MIXER_CHANNEL_TOP_CENTER] = N_("Top Center"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_LEFT] = N_("Top Rear Left"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_RIGHT] = N_("Top Rear Right"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_CENTER] = N_("Top Rear Center")
+};
+
+const gchar *
+gvc_channel_position_to_pulse_string (MateMixerChannelPosition position)
+{
+        g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
+
+        return pulse_position[position];
+}
+
+const gchar *
+gvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
+{
+        g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
+
+        return pretty_position[position];
+}
+
+const gchar *
+gvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
+{
+        g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
+
+#define HAS_POSITION(p) (mate_mixer_stream_control_has_channel_position (control, (p)))
+
+        /* Modeled after PulseAudio 5.0, probably could be extended with other combinations */
+        switch (mate_mixer_stream_control_get_num_channels (control)) {
+        case 1:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_MONO))
+                        return _("Mono");
+                break;
+        case 2:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT))
+                        return _("Stereo");
+                break;
+        case 4:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
+                        return _("Surround 4.0");
+                break;
+        case 5:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
+                        if (HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                                return _("Surround 4.1");
+                        if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER))
+                                return _("Surround 5.0");
+                break;
+        case 6:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                        return _("Surround 5.1");
+                break;
+        case 8:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                        return _("Surround 7.1");
+                break;
+        }
+
+#undef HAS_POSITION
+
+        return NULL;
+}
diff --git a/mate-volume-control/src/mvc-helpers.h b/mate-volume-control/gvc-utils.h
index 050e66b..b39abb0 100644
--- a/mate-volume-control/src/mvc-helpers.h
+++ b/mate-volume-control/gvc-utils.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __MVC_HELPERS_H
-#define __MVC_HELPERS_H
+#ifndef __GVC_HELPERS_H
+#define __GVC_HELPERS_H
 
 #include <glib.h>
 
@@ -27,16 +27,10 @@
 
 G_BEGIN_DECLS
 
-const gchar *mvc_channel_position_to_string        (MateMixerChannelPosition position);
-const gchar *mvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
-const gchar *mvc_channel_map_to_pretty_string      (MateMixerStreamControl  *control);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-void         mvc_color_shade                       (GdkRGBA                 *a,
-                                                    GdkRGBA                 *b,
-                                                    gdouble                  k);
-#endif
+const gchar *gvc_channel_position_to_pulse_string  (MateMixerChannelPosition position);
+const gchar *gvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
+const gchar *gvc_channel_map_to_pretty_string      (MateMixerStreamControl  *control);
 
 G_END_DECLS
 
-#endif /* __MVC_HELPERS_H */
+#endif /* __GVC_HELPERS_H */
diff --git a/mate-volume-control/sound-theme-file-utils.c b/mate-volume-control/sound-theme-file-utils.c
new file mode 100644
index 0000000..1de9886
--- /dev/null
+++ b/mate-volume-control/sound-theme-file-utils.c
@@ -0,0 +1,305 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * Copyright (C) 2008 Bastien Nocera <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <config.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <utime.h>
+#include <strings.h>
+
+#include "sound-theme-file-utils.h"
+
+#define CUSTOM_THEME_NAME       "__custom"
+
+/* This function needs to be called after each individual
+ * changeset to the theme */
+void
+custom_theme_update_time (void)
+{
+        char *path;
+
+        path = custom_theme_dir_path (NULL);
+        utime (path, NULL);
+        g_free (path);
+}
+
+char *
+custom_theme_dir_path (const char *child)
+{
+        static char *dir = NULL;
+        const char *data_dir;
+
+        if (dir == NULL) {
+                data_dir = g_get_user_data_dir ();
+                dir = g_build_filename (data_dir, "sounds", CUSTOM_THEME_NAME, NULL);
+        }
+        if (child == NULL)
+                return g_strdup (dir);
+
+        return g_build_filename (dir, child, NULL);
+}
+
+static gboolean
+directory_delete_recursive (GFile *directory, GError **error)
+{
+        GFileEnumerator *enumerator;
+        GFileInfo *info;
+        gboolean success = TRUE;
+
+        enumerator = g_file_enumerate_children (directory,
+                                                G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                                G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                                G_FILE_QUERY_INFO_NONE,
+                                                NULL, error);
+        if (enumerator == NULL)
+                return FALSE;
+
+        while (success &&
+               (info = g_file_enumerator_next_file (enumerator, NULL, NULL))) {
+                GFile *child;
+
+                child = g_file_get_child (directory, g_file_info_get_name (info));
+
+                if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
+                        success = directory_delete_recursive (child, error);
+                }
+                g_object_unref (info);
+
+                if (success)
+                        success = g_file_delete (child, NULL, error);
+        }
+        g_file_enumerator_close (enumerator, NULL, NULL);
+
+        if (success)
+                success = g_file_delete (directory, NULL, error);
+
+        return success;
+}
+
+/**
+ * capplet_file_delete_recursive :
+ * @file :
+ * @error  :
+ *
+ * A utility routine to delete files and/or directories,
+ * including non-empty directories.
+ **/
+static gboolean
+capplet_file_delete_recursive (GFile *file, GError **error)
+{
+        GFileInfo *info;
+        GFileType type;
+
+        g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+        info = g_file_query_info (file,
+                                  G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                  G_FILE_QUERY_INFO_NONE,
+                                  NULL, error);
+        if (info == NULL)
+                return FALSE;
+
+        type = g_file_info_get_file_type (info);
+        g_object_unref (info);
+
+        if (type == G_FILE_TYPE_DIRECTORY)
+                return directory_delete_recursive (file, error);
+        else
+                return g_file_delete (file, NULL, error);
+}
+
+void
+delete_custom_theme_dir (void)
+{
+        char *dir;
+        GFile *file;
+
+        dir = custom_theme_dir_path (NULL);
+        file = g_file_new_for_path (dir);
+        g_free (dir);
+        capplet_file_delete_recursive (file, NULL);
+        g_object_unref (file);
+
+        g_debug ("deleted the custom theme dir");
+}
+
+gboolean
+custom_theme_dir_is_empty (void)
+{
+        char            *dir;
+        GFile           *file;
+        gboolean         is_empty;
+        GFileEnumerator *enumerator;
+        GFileInfo       *info;
+        GError          *error = NULL;
+
+        dir = custom_theme_dir_path (NULL);
+        file = g_file_new_for_path (dir);
+        g_free (dir);
+
+        is_empty = TRUE;
+
+        enumerator = g_file_enumerate_children (file,
+                                                G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                                G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                                G_FILE_QUERY_INFO_NONE,
+                                                NULL, &error);
+        if (enumerator == NULL) {
+                g_warning ("Unable to enumerate files: %s", error->message);
+                g_error_free (error);
+                goto out;
+        }
+
+        while (is_empty &&
+               (info = g_file_enumerator_next_file (enumerator, NULL, NULL))) {
+
+                if (strcmp ("index.theme", g_file_info_get_name (info)) != 0) {
+                        is_empty = FALSE;
+                }
+
+                g_object_unref (info);
+        }
+        g_file_enumerator_close (enumerator, NULL, NULL);
+
+ out:
+        g_object_unref (file);
+
+        return is_empty;
+}
+
+static void
+delete_one_file (const char *sound_name, const char *pattern)
+{
+        GFile *file;
+        char *name, *filename;
+
+        name = g_strdup_printf (pattern, sound_name);
+        filename = custom_theme_dir_path (name);
+        g_free (name);
+        file = g_file_new_for_path (filename);
+        g_free (filename);
+        capplet_file_delete_recursive (file, NULL);
+        g_object_unref (file);
+}
+
+void
+delete_old_files (const char **sounds)
+{
+        guint i;
+
+        for (i = 0; sounds[i] != NULL; i++) {
+                delete_one_file (sounds[i], "%s.ogg");
+        }
+}
+
+void
+delete_disabled_files (const char **sounds)
+{
+        guint i;
+
+        for (i = 0; sounds[i] != NULL; i++)
+                delete_one_file (sounds[i], "%s.disabled");
+}
+
+static void
+create_one_file (GFile *file)
+{
+        GFileOutputStream* stream;
+
+        stream = g_file_create (file, G_FILE_CREATE_NONE, NULL, NULL);
+        if (stream != NULL) {
+                g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, NULL);
+                g_object_unref (stream);
+        }
+}
+
+void
+add_disabled_file (const char **sounds)
+{
+        guint i;
+
+        for (i = 0; sounds[i] != NULL; i++) {
+                GFile *file;
+                char *name, *filename;
+
+                name = g_strdup_printf ("%s.disabled", sounds[i]);
+                filename = custom_theme_dir_path (name);
+                g_free (name);
+                file = g_file_new_for_path (filename);
+                g_free (filename);
+
+                create_one_file (file);
+                g_object_unref (file);
+        }
+}
+
+void
+add_custom_file (const char **sounds, const char *filename)
+{
+        guint i;
+
+        for (i = 0; sounds[i] != NULL; i++) {
+                GFile *file;
+                char *name, *path;
+
+                /* We use *.ogg because it's the first type of file that
+                 * libcanberra looks at */
+                name = g_strdup_printf ("%s.ogg", sounds[i]);
+                path = custom_theme_dir_path (name);
+                g_free (name);
+                /* In case there's already a link there, delete it */
+                g_unlink (path);
+                file = g_file_new_for_path (path);
+                g_free (path);
+
+                /* Create the link */
+                g_file_make_symbolic_link (file, filename, NULL, NULL);
+                g_object_unref (file);
+        }
+}
+
+void
+create_custom_theme (const char *parent)
+{
+        GKeyFile *keyfile;
+        char     *data;
+        char     *path;
+
+        /* Create the custom directory */
+        path = custom_theme_dir_path (NULL);
+        g_mkdir_with_parents (path, 0755);
+        g_free (path);
+
+        /* Set the data for index.theme */
+        keyfile = g_key_file_new ();
+        g_key_file_set_string (keyfile, "Sound Theme", "Name", _("Custom"));
+        g_key_file_set_string (keyfile, "Sound Theme", "Inherits", parent);
+        g_key_file_set_string (keyfile, "Sound Theme", "Directories", ".");
+        data = g_key_file_to_data (keyfile, NULL, NULL);
+        g_key_file_free (keyfile);
+
+        /* Save the index.theme */
+        path = custom_theme_dir_path ("index.theme");
+        g_file_set_contents (path, data, -1, NULL);
+        g_free (path);
+        g_free (data);
+
+        custom_theme_update_time ();
+}
diff --git a/mate-volume-control/sound-theme-file-utils.h b/mate-volume-control/sound-theme-file-utils.h
new file mode 100644
index 0000000..0ac248b
--- /dev/null
+++ b/mate-volume-control/sound-theme-file-utils.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * Copyright (C) 2008 Bastien Nocera <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+#ifndef __SOUND_THEME_FILE_UTILS_HH__
+#define __SOUND_THEME_FILE_UTILS_HH__
+
+#include <gio/gio.h>
+
+char *custom_theme_dir_path (const char *child);
+gboolean custom_theme_dir_is_empty (void);
+void create_custom_theme (const char *parent);
+
+void delete_custom_theme_dir (void);
+void delete_old_files (const char **sounds);
+void delete_disabled_files (const char **sounds);
+
+void add_disabled_file (const char **sounds);
+void add_custom_file (const char **sounds, const char *filename);
+
+void custom_theme_update_time (void);
+
+#endif /* __SOUND_THEME_FILE_UTILS_HH__ */
diff --git a/mate-volume-control/src/Makefile.am b/mate-volume-control/src/Makefile.am
deleted file mode 100644
index 50e3c15..0000000
--- a/mate-volume-control/src/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-NULL =
-
-bin_PROGRAMS = 					\
-	mate-volume-control-applet		\
-	mate-volume-control			\
-	$(NULL)
-
-AM_CPPFLAGS =					\
-	$(WARN_CFLAGS)				\
-	-I$(top_srcdir)/sound-theme		\
-	$(VOLUME_CONTROL_CFLAGS)		\
-	$(xxDISABLE_DEPRECATED)			\
-	$(PULSEAUDIO_CFLAGS)			\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
-	-DLIBEXECDIR=\"$(libexecdir)\"		\
-	-DGLADEDIR=\""$(pkgdatadir)"\"		\
-	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
-	$(NULL)
-
-noinst_LTLIBRARIES = libmatevolumecontrol.la
-libmatevolumecontrol_la_SOURCES =		\
-	gvc-channel-bar.h			\
-	gvc-channel-bar.c			\
-    mvc-helpers.c               \
-    mvc-helpers.h               \
-	$(NULL)
-
-mate_volume_control_applet_LDADD =		\
-	-lm					\
-	libmatevolumecontrol.la		\
-	$(VOLUME_CONTROL_LIBS)			\
-	$(PULSEAUDIO_LIBS)			\
-	$(NULL)
-
-mate_volume_control_applet_SOURCES =		\
-	gvc-stream-status-icon.h		\
-	gvc-stream-status-icon.c		\
-	gvc-applet.h				\
-	gvc-applet.c				\
-	applet-main.c				\
-	$(NULL)
-
-mate_volume_control_LDADD =				\
-	-lm						\
-	libmatevolumecontrol.la			\
-	$(top_builddir)/sound-theme/libsoundtheme.la	\
-	$(VOLUME_CONTROL_LIBS)				\
-	$(PULSEAUDIO_LIBS)				\
-	$(NULL)
-
-mate_volume_control_SOURCES =			\
-	gvc-balance-bar.h			\
-	gvc-balance-bar.c			\
-	gvc-level-bar.h				\
-	gvc-level-bar.c				\
-	gvc-combo-box.h				\
-	gvc-combo-box.c				\
-	gvc-speaker-test.h			\
-	gvc-speaker-test.c			\
-    gvc-mixer-dialog.h          \
-    gvc-mixer-dialog.c          \
-	dialog-main.c				\
-	$(NULL)
-
-BUILT_SOURCES =				\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/src/mvc-helpers.c b/mate-volume-control/src/mvc-helpers.c
deleted file mode 100644
index 7488743..0000000
--- a/mate-volume-control/src/mvc-helpers.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2014 Michal Ratajsky <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libmatemixer/matemixer.h>
-
-#ifdef HAVE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#endif
-
-#include "mvc-helpers.h"
-
-#ifdef HAVE_PULSEAUDIO
-static pa_channel_position_t
-position_to_pulse (MateMixerChannelPosition position)
-{
-        switch (position) {
-        case MATE_MIXER_CHANNEL_MONO:
-                return PA_CHANNEL_POSITION_MONO;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_LFE:
-                return PA_CHANNEL_POSITION_LFE;
-        case MATE_MIXER_CHANNEL_BACK_LEFT:
-                return PA_CHANNEL_POSITION_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_BACK_CENTER:
-                return PA_CHANNEL_POSITION_REAR_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_SIDE_LEFT:
-                return PA_CHANNEL_POSITION_SIDE_LEFT;
-        case MATE_MIXER_CHANNEL_SIDE_RIGHT:
-                return PA_CHANNEL_POSITION_SIDE_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_TOP_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_CENTER:
-                return PA_CHANNEL_POSITION_TOP_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_BACK_LEFT:
-                return PA_CHANNEL_POSITION_TOP_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_CENTER:
-                return PA_CHANNEL_POSITION_TOP_REAR_CENTER;
-        default:
-                return PA_CHANNEL_POSITION_INVALID;
-        }
-}
-#endif
-
-const gchar *
-mvc_channel_position_to_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_pretty_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
-{
-        g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
-
-#define HAS_POSITION(p) (mate_mixer_stream_control_has_channel_position (control, (p)))
-
-        /* Modeled after PulseAudio 5.0, probably could be extended with other combinations */
-        switch (mate_mixer_stream_control_get_num_channels (control)) {
-        case 1:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_MONO))
-                        return _("Mono");
-                break;
-        case 2:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT))
-                        return _("Stereo");
-                break;
-        case 4:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        return _("Surround 4.0");
-                break;
-        case 5:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                                return _("Surround 4.1");
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER))
-                                return _("Surround 5.0");
-                break;
-        case 6:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 5.1");
-                break;
-        case 8:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 7.1");
-                break;
-        }
-
-#undef HAS_POSITION
-
-        return NULL;
-}
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-/* Taken from gtkstyle.c */
-static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
-static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
-
-void
-mvc_color_shade (GdkRGBA *a, GdkRGBA *b, gdouble k)
-{
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-
-        red = (gdouble) a->red / 65535.0;
-        green = (gdouble) a->green / 65535.0;
-        blue = (gdouble) a->blue / 65535.0;
-
-        rgb_to_hls (&red, &green, &blue);
-
-        green *= k;
-        if (green > 1.0)
-                green = 1.0;
-        else if (green < 0.0)
-                green = 0.0;
-
-        blue *= k;
-        if (blue > 1.0)
-                blue = 1.0;
-        else if (blue < 0.0)
-                blue = 0.0;
-
-        hls_to_rgb (&red, &green, &blue);
-
-        b->red = red * 65535.0;
-        b->green = green * 65535.0;
-        b->blue = blue * 65535.0;
-}
-
-static void
-rgb_to_hls (gdouble *r, gdouble *g, gdouble *b)
-{
-        gdouble min;
-        gdouble max;
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-        gdouble h, l, s;
-        gdouble delta;
-
-        red = *r;
-        green = *g;
-        blue = *b;
-
-        if (red > green) {
-                if (red > blue)
-                        max = red;
-                else
-                        max = blue;
-
-                if (green < blue)
-                        min = green;
-                else
-                        min = blue;
-        } else {
-                if (green > blue)
-                        max = green;
-                else
-                        max = blue;
-
-                if (red < blue)
-                        min = red;
-                else
-                        min = blue;
-        }
-
-        l = (max + min) / 2;
-        s = 0;
-        h = 0;
-
-        if (max != min) {
-                if (l <= 0.5)
-                        s = (max - min) / (max + min);
-                else
-                        s = (max - min) / (2 - max - min);
-
-                delta = max - min;
-                if (red == max)
-                        h = (green - blue) / delta;
-                else if (green == max)
-                        h = 2 + (blue - red) / delta;
-                else if (blue == max)
-                        h = 4 + (red - green) / delta;
-
-                h *= 60;
-                if (h < 0.0)
-                        h += 360;
-        }
-
-        *r = h;
-        *g = l;
-        *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h, gdouble *l, gdouble *s)
-{
-        gdouble hue;
-        gdouble lightness;
-        gdouble saturation;
-        gdouble m1, m2;
-        gdouble r, g, b;
-
-        lightness = *l;
-        saturation = *s;
-
-        if (lightness <= 0.5)
-                m2 = lightness * (1 + saturation);
-        else
-                m2 = lightness + saturation - lightness * saturation;
-        m1 = 2 * lightness - m2;
-
-        if (saturation == 0) {
-                *h = lightness;
-                *l = lightness;
-                *s = lightness;
-        } else {
-                hue = *h + 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        r = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        r = m2;
-                else if (hue < 240)
-                        r = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        r = m1;
-
-                hue = *h;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        g = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        g = m2;
-                else if (hue < 240)
-                        g = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        g = m1;
-
-                hue = *h - 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        b = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        b = m2;
-                else if (hue < 240)
-                        b = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        b = m1;
-
-                *h = r;
-                *l = g;
-                *s = b;
-        }
-}
-#endif