diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshalways.gif b/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshalways.gif
new file mode 100644
index 00000000000..2c508633881
Binary files /dev/null and b/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshalways.gif differ
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshmanual.gif b/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshmanual.gif
new file mode 100644
index 00000000000..b4b031e58d9
Binary files /dev/null and b/plugins/org.eclipse.dd.dsf.debug.ui/icons/refreshmanual.gif differ
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
index 93dcaa70862..b0b880bf600 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
@@ -50,121 +50,6 @@
             verticalRulerPreferenceValue="true">
       </specification>
    </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
-            targetID="org.eclipse.debug.ui.RegisterView">
-         <menu
-               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
-               label="Update Mode"
-               path="additions">
-            <groupMarker
-                  name="content">
-            </groupMarker>
-            <separator
-                  name="additions">
-            </separator>
-         </menu>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
-               label="Manual"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
-               label="On Breakpoint Hit"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
-               definitionId="org.eclipse.debug.ui.RegisterView"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
-               label="Always"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               state="true"
-               style="radio">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
-            targetID="org.eclipse.debug.ui.ExpressionView">
-         <menu
-               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
-               label="Update Mode"
-               path="additions">
-            <groupMarker
-                  name="content">
-            </groupMarker>
-            <separator
-                  name="additions">
-            </separator>
-         </menu>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
-               label="Manual"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
-               label="On Breakpoint Hit"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
-               label="Always"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               state="true"
-               style="radio">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
-            targetID="org.eclipse.debug.ui.VariableView">
-         <menu
-               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
-               label="Update Mode"
-               path="additions">
-            <groupMarker
-                  name="content">
-            </groupMarker>
-            <separator
-                  name="additions">
-            </separator>
-         </menu>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
-               label="Manual"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
-               label="On Breakpoint Hit"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
-               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
-               label="Always"
-               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
-               state="true"
-               style="radio">
-         </action>
-      </viewerContribution>
-   </extension>
    <extension
          point="org.eclipse.ui.viewActions">
       <viewContribution
@@ -200,6 +85,126 @@
                toolbarPath="additions">
          </action>
       </viewContribution>
+      <viewContribution
+            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
+            targetID="org.eclipse.debug.ui.VariableView">
+            <menu
+               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
+               label="Update Mode"
+               path="additions">
+            <groupMarker
+                  name="content">
+            </groupMarker>
+            <separator
+                  name="additions">
+            </separator>
+         </menu>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
+               label="Manual"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
+               label="On Breakpoint Hit"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
+               definitionId="org.eclipse.debug.ui.RegisterView"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
+               label="Always"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               state="true"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+      </viewContribution>
+      <viewContribution
+            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
+            targetID="org.eclipse.debug.ui.ExpressionView">
+            <menu
+               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
+               label="Update Mode"
+               path="additions">
+            <groupMarker
+                  name="content">
+            </groupMarker>
+            <separator
+                  name="additions">
+            </separator>
+         </menu>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
+               label="Manual"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
+               label="On Breakpoint Hit"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
+               definitionId="org.eclipse.debug.ui.RegisterView"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
+               label="Always"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               state="true"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+      </viewContribution>
+      <viewContribution
+            id="org.eclipse.dd.dsf.debug.ui.update.UpdatePopup"
+            targetID="org.eclipse.debug.ui.RegisterView">
+            <menu
+               id="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu"
+               label="Update Mode"
+               path="additions">
+            <groupMarker
+                  name="content">
+            </groupMarker>
+            <separator
+                  name="additions">
+            </separator>
+         </menu>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshManualActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshManual"
+               label="Manual"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshOnBreakActionDelegate"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshOnBreak"
+               label="On Breakpoint Hit"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.RefreshAlwaysActionDelegate"
+               definitionId="org.eclipse.debug.ui.RegisterView"
+               id="org.eclipse.dd.dsf.debug.ui.update.registers.RefreshAlways"
+               label="Always"
+               menubarPath="org.eclipse.dd.dsf.debug.ui.update.UpdateModeSubMenu/content"
+               state="true"
+               style="radio"
+               toolbarPath="additions">
+         </action>
+      </viewContribution>
    </extension>
    
 	<extension