diff --git a/lib/features/context-pad/ContextPadProvider.js b/lib/features/context-pad/ContextPadProvider.js
index 75d62986..4374fa73 100644
--- a/lib/features/context-pad/ContextPadProvider.js
+++ b/lib/features/context-pad/ContextPadProvider.js
@@ -95,9 +95,12 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       create.start(event, shape, element);
     }
 
+    var shortType = type.replace(/^bpmn\:/, '');
+
     return {
       group: 'model',
       className: className,
+      title: 'Append ' + shortType,
       action: {
         dragstart: appendListener,
         click: appendListener
@@ -135,15 +138,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
                                                   { _eventDefinitionType: 'bpmn:ConditionalEventDefinition'}),
         'append.signal-intermediate-event': appendAction('bpmn:IntermediateCatchEvent',
                                                   'icon-intermediate-event-catch-signal',
-                                                  { _eventDefinitionType: 'bpmn:SignalEventDefinition'}),
-        'connect': {
-          group: 'connect',
-          className: 'icon-connection',
-          action: {
-            click: startConnect,
-            dragstart: startConnect
-          }
-        }
+                                                  { _eventDefinitionType: 'bpmn:SignalEventDefinition'})
       });
     }
 
@@ -154,6 +149,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         'replace': {
           group: 'edit',
           className: 'icon-screw-wrench',
+          title: 'Change type',
           action: {
             click: function(event, element) {
               bpmnReplace.openChooser(getReplaceMenuPosition(element), element);
@@ -172,7 +168,8 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 
       'connect': {
         group: 'connect',
-        className: 'icon-connection-multi',
+        className: 'icon-connection',
+        title: 'Connect using Sequence/MessageFlow',
         action: {
           click: startConnect,
           dragstart: startConnect
@@ -186,6 +183,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     'delete': {
       group: 'edit',
       className: 'icon-trash',
+      title: 'Remove',
       action: {
         click: removeElement,
         dragstart: removeElement
diff --git a/lib/features/palette/PaletteProvider.js b/lib/features/palette/PaletteProvider.js
index 02b57842..a02fe7c1 100644
--- a/lib/features/palette/PaletteProvider.js
+++ b/lib/features/palette/PaletteProvider.js
@@ -41,10 +41,12 @@ PaletteProvider.prototype.getPaletteEntries = function(element) {
       create.start(event, shape);
     }
 
+    var shortType = type.replace(/^bpmn\:/, '');
+
     return {
       group: group,
       className: className,
-      title: title || 'Create ' + type,
+      title: title || 'Create ' + shortType,
       action: {
         dragstart: createListener,
         click: createListener
@@ -97,17 +99,17 @@ PaletteProvider.prototype.getPaletteEntries = function(element) {
       'bpmn:Task', 'activity', 'icon-task'
     ),
     'create.subprocess-collapsed': createAction(
-      'bpmn:SubProcess', 'activity', 'icon-subprocess-collapsed', 'Sub Process (collapsed)',
+      'bpmn:SubProcess', 'activity', 'icon-subprocess-collapsed', 'Create collapsed Sub Process',
       { isExpanded: false }
     ),
     'create.subprocess-expanded': createAction(
-      'bpmn:SubProcess', 'activity', 'icon-subprocess-expanded', 'Sub Process (expanded)',
+      'bpmn:SubProcess', 'activity', 'icon-subprocess-expanded', 'Create expanded SubProcess',
       { isExpanded: true }
     ),
     'create.participant-expanded': {
       group: 'collaboration',
       className: 'icon-participant',
-      title: 'Create a participant',
+      title: 'Create Pool/Participant',
       action: {
         dragstart: createParticipant,
         click: createParticipant