--- a/accessible/android/AccessibleWrap.cpp
+++ b/accessible/android/AccessibleWrap.cpp
@@ -223,26 +223,28 @@ AccessibleWrap::CreateBundle(int32_t aPa
   GECKOBUNDLE_START(nodeInfo);
   GECKOBUNDLE_PUT(nodeInfo, "id", java::sdk::Integer::ValueOf(VirtualViewID()));
   GECKOBUNDLE_PUT(nodeInfo, "parentId", java::sdk::Integer::ValueOf(aParentID));
   uint64_t flags = GetFlags(aRole, aState);
   GECKOBUNDLE_PUT(nodeInfo, "flags", java::sdk::Integer::ValueOf(flags));
 
   nsAutoString geckoRole;
   nsAutoString roleDescription;
-  nsAutoString className;
-  GetAndroidRoleAndClass(aRole, geckoRole, roleDescription, className);
+  int32_t androidClass = java::SessionAccessibility::CLASSNAME_VIEW;
   if (VirtualViewID() == kNoID) {
-    className.AssignLiteral("android.webkit.WebView");
-    roleDescription.AssignLiteral("");
+    androidClass = java::SessionAccessibility::CLASSNAME_WEBVIEW;
+  } else {
+    GetRoleDescription(aRole, geckoRole, roleDescription);
+    androidClass = GetAndroidClass(aRole);
   }
+
   GECKOBUNDLE_PUT(
     nodeInfo, "roleDescription", jni::StringParam(roleDescription));
   GECKOBUNDLE_PUT(nodeInfo, "geckoRole", jni::StringParam(geckoRole));
-  GECKOBUNDLE_PUT(nodeInfo, "className", jni::StringParam(className));
+  GECKOBUNDLE_PUT(nodeInfo, "className", java::sdk::Integer::ValueOf(androidClass));
 
   if (!aTextValue.IsEmpty() &&
       (flags & java::SessionAccessibility::FLAG_EDITABLE)) {
     GECKOBUNDLE_PUT(nodeInfo, "hint", jni::StringParam(aName));
     GECKOBUNDLE_PUT(nodeInfo, "text", jni::StringParam(aTextValue));
   } else {
     GECKOBUNDLE_PUT(nodeInfo, "text", jni::StringParam(aName));
   }
@@ -405,20 +407,19 @@ AccessibleWrap::GetFlags(role aRole, uin
   if (aRole == roles::PASSWORD_TEXT) {
     flags |= java::SessionAccessibility::FLAG_PASSWORD;
   }
 
   return flags;
 }
 
 void
-AccessibleWrap::GetAndroidRoleAndClass(role aRole,
-                                       nsAString& aGeckoRole,
-                                       nsAString& aRoleDescription,
-                                       nsAString& aClassStr)
+AccessibleWrap::GetRoleDescription(role aRole,
+                                   nsAString& aGeckoRole,
+                                   nsAString& aRoleDescription)
 {
   nsresult rv = NS_OK;
 
   nsCOMPtr<nsIStringBundleService> sbs =
     do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to get string bundle service");
     return;
@@ -426,39 +427,41 @@ AccessibleWrap::GetAndroidRoleAndClass(r
 
   nsCOMPtr<nsIStringBundle> bundle;
   rv = sbs->CreateBundle(ROLE_STRINGS_URL, getter_AddRefs(bundle));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to get string bundle");
     return;
   }
 
+  GetAccService()->GetStringRole(aRole, aGeckoRole);
+  rv = bundle->GetStringFromName(NS_ConvertUTF16toUTF8(aGeckoRole).get(), aRoleDescription);
+  if (NS_FAILED(rv)) {
+    aRoleDescription.AssignLiteral("");
+  }
+}
+
+int32_t
+AccessibleWrap::GetAndroidClass(role aRole)
+{
 #define ROLE(geckoRole,                                                        \
              stringRole,                                                       \
              atkRole,                                                          \
              macRole,                                                          \
              msaaRole,                                                         \
              ia2Role,                                                          \
              androidClass,                                                     \
              nameRule)                                                         \
   case roles::geckoRole:                                                       \
-    rv = bundle->GetStringFromName(stringRole, aRoleDescription);              \
-    if (NS_FAILED(rv))                                                         \
-      aRoleDescription.AssignLiteral("");                                      \
-    aGeckoRole.AssignLiteral(stringRole);                                      \
-    aClassStr.AssignLiteral(androidClass);                                     \
-    break;
+    return androidClass;
 
   switch (aRole) {
 #include "RoleMap.h"
     default:
-      aRoleDescription.AssignLiteral("");
-      aGeckoRole.AssignLiteral("nothing");
-      aClassStr.AssignLiteral("android.view.View");
-      return;
+      return java::SessionAccessibility::CLASSNAME_VIEW;
   }
 
 #undef ROLE
 }
 
 void
 AccessibleWrap::DOMNodeID(nsString& aDOMNodeID)
 {

--- a/accessible/android/AccessibleWrap.h
+++ b/accessible/android/AccessibleWrap.h
@@ -50,25 +50,26 @@ protected:
     double aStep,
     nsIPersistentProperties* aAttributes,
     const nsTArray<int32_t>& aChildren) const;
 
   // IDs should be a positive 32bit integer.
   static int32_t AcquireID();
   static void ReleaseID(int32_t aID);
 
+  static int32_t GetAndroidClass(role aRole);
+
   int32_t mID;
 
 private:
   void DOMNodeID(nsString& aDOMNodeID);
 
-  static void GetAndroidRoleAndClass(role aRole,
-                                     nsAString& aGeckoRole,
-                                     nsAString& aRoleDescription,
-                                     nsAString& aClassStr);
+  static void GetRoleDescription(role aRole,
+                                 nsAString& aGeckoRole,
+                                 nsAString& aRoleDescription);
 
   static uint64_t GetFlags(role aRole, uint64_t aState);
 };
 
 static inline AccessibleWrap*
 WrapperFor(const ProxyAccessible* aProxy)
 {
   return reinterpret_cast<AccessibleWrap*>(aProxy->GetWrapper());

--- a/accessible/base/EventQueue.cpp
+++ b/accessible/base/EventQueue.cpp
@@ -106,17 +106,18 @@ EventQueue::CoalesceEvents()
       for (uint32_t index = tail - 1; index < tail; index--) {
         AccEvent* accEvent = mEvents[index];
         if (accEvent->mEventType == tailEvent->mEventType &&
           accEvent->mEventRule == tailEvent->mEventRule) {
           accEvent->mEventRule = AccEvent::eDoNotEmit;
           return;
         }
       }
-    } break; // case eCoalesceOfSameType
+      break; // case eCoalesceOfSameType
+    }
 
     case AccEvent::eCoalesceSelectionChange:
     {
       AccSelChangeEvent* tailSelChangeEvent = downcast_accEvent(tailEvent);
       for (uint32_t index = tail - 1; index < tail; index--) {
         AccEvent* thisEvent = mEvents[index];
         if (thisEvent->mEventRule == tailEvent->mEventRule) {
           AccSelChangeEvent* thisSelChangeEvent =
@@ -124,18 +125,18 @@ EventQueue::CoalesceEvents()
 
           // Coalesce selection change events within same control.
           if (tailSelChangeEvent->mWidget == thisSelChangeEvent->mWidget) {
             CoalesceSelChangeEvents(tailSelChangeEvent, thisSelChangeEvent, index);
             return;
           }
         }
       }
-
-    } break; // eCoalesceSelectionChange
+      break; // eCoalesceSelectionChange
+    }
 
     case AccEvent::eCoalesceStateChange:
     {
       // If state change event is duped then ignore previous event. If state
       // change event is opposite to previous event then no event is emitted
       // (accessible state wasn't changed).
       for (uint32_t index = tail - 1; index < tail; index--) {
         AccEvent* thisEvent = mEvents[index];
@@ -167,32 +168,34 @@ EventQueue::CoalesceEvents()
           AccTextSelChangeEvent* thisTSCEvent = downcast_accEvent(thisEvent);
           AccTextSelChangeEvent* tailTSCEvent = downcast_accEvent(tailEvent);
           if (thisTSCEvent->mSel == tailTSCEvent->mSel ||
               thisEvent->mAccessible == tailEvent->mAccessible)
             thisEvent->mEventRule = AccEvent::eDoNotEmit;
         }
 
       }
-    } break; // eCoalesceTextSelChange
+      break; // eCoalesceTextSelChange
+    }
 
     case AccEvent::eRemoveDupes:
     {
       // Check for repeat events, coalesce newly appended event by more older
       // event.
       for (uint32_t index = tail - 1; index < tail; index--) {
         AccEvent* accEvent = mEvents[index];
         if (accEvent->mEventType == tailEvent->mEventType &&
           accEvent->mEventRule == tailEvent->mEventRule &&
           accEvent->mAccessible == tailEvent->mAccessible) {
           tailEvent->mEventRule = AccEvent::eDoNotEmit;
           return;
         }
       }
-    } break; // case eRemoveDupes
+      break; // case eRemoveDupes
+    }
 
     default:
       break; // case eAllowDupes, eDoNotEmit
   } // switch
 }
 
 void
 EventQueue::CoalesceSelChangeEvents(AccSelChangeEvent* aTailEvent,

--- a/accessible/base/RoleMap.h
+++ b/accessible/base/RoleMap.h
@@ -8,152 +8,152 @@
  */
 
 ROLE(NOTHING,
      "nothing",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(TITLEBAR,
      "titlebar",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Irrelevant on OS X; windows are always native.
      ROLE_SYSTEM_TITLEBAR,
      ROLE_SYSTEM_TITLEBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MENUBAR,
      "menubar",
      ATK_ROLE_MENU_BAR,
      NSAccessibilityMenuBarRole,  //Irrelevant on OS X; the menubar will always be native and on the top of the screen.
      ROLE_SYSTEM_MENUBAR,
      ROLE_SYSTEM_MENUBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SCROLLBAR,
      "scrollbar",
      ATK_ROLE_SCROLL_BAR,
      NSAccessibilityScrollBarRole,  //We might need to make this its own mozAccessible, to support the children objects (valueindicator, down/up buttons).
      ROLE_SYSTEM_SCROLLBAR,
      ROLE_SYSTEM_SCROLLBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromValueRule)
 
 ROLE(GRIP,
      "grip",
      ATK_ROLE_UNKNOWN,
      NSAccessibilitySplitterRole,
      ROLE_SYSTEM_GRIP,
      ROLE_SYSTEM_GRIP,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SOUND,
      "sound",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Unused on OS X.
      ROLE_SYSTEM_SOUND,
      ROLE_SYSTEM_SOUND,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CURSOR,
      "cursor",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Unused on OS X.
      ROLE_SYSTEM_CURSOR,
      ROLE_SYSTEM_CURSOR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CARET,
      "caret",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Unused on OS X.
      ROLE_SYSTEM_CARET,
      ROLE_SYSTEM_CARET,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(ALERT,
      "alert",
      ATK_ROLE_ALERT,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_ALERT,
      ROLE_SYSTEM_ALERT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(WINDOW,
      "window",
      ATK_ROLE_WINDOW,
      NSAccessibilityWindowRole,  //Irrelevant on OS X; all window a11y is handled by the system.
      ROLE_SYSTEM_WINDOW,
      ROLE_SYSTEM_WINDOW,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(INTERNAL_FRAME,
      "internal frame",
      ATK_ROLE_INTERNAL_FRAME,
      NSAccessibilityScrollAreaRole,
      USE_ROLE_STRING,
      IA2_ROLE_INTERNAL_FRAME,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MENUPOPUP,
      "menupopup",
      ATK_ROLE_MENU,
      NSAccessibilityMenuRole,  //The parent of menuitems.
      ROLE_SYSTEM_MENUPOPUP,
      ROLE_SYSTEM_MENUPOPUP,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MENUITEM,
      "menuitem",
      ATK_ROLE_MENU_ITEM,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_MENUITEM,
      ROLE_SYSTEM_MENUITEM,
-     "android.view.MenuItem",
+     java::SessionAccessibility::CLASSNAME_MENUITEM,
      eNameFromSubtreeRule)
 
 ROLE(TOOLTIP,
      "tooltip",
      ATK_ROLE_TOOL_TIP,
      @"AXHelpTag",  //10.4+ only, so we re-define the constant.
      ROLE_SYSTEM_TOOLTIP,
      ROLE_SYSTEM_TOOLTIP,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(APPLICATION,
      "application",
      ATK_ROLE_EMBEDDED,
      NSAccessibilityGroupRole,  //Unused on OS X. the system will take care of this.
      ROLE_SYSTEM_APPLICATION,
      ROLE_SYSTEM_APPLICATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(DOCUMENT,
      "document",
      ATK_ROLE_DOCUMENT_WEB,
      @"AXWebArea",
      ROLE_SYSTEM_DOCUMENT,
      ROLE_SYSTEM_DOCUMENT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 /**
  *  msaa comment:
  *   We used to map to ROLE_SYSTEM_PANE, but JAWS would
  *   not read the accessible name for the contaning pane.
  *   However, JAWS will read the accessible name for a groupbox.
  *   By mapping a PANE to a GROUPING, we get no undesirable effects,
@@ -161,1462 +161,1462 @@ ROLE(DOCUMENT,
  *   when an inner control gets focused.
  */
 ROLE(PANE,
      "pane",
      ATK_ROLE_PANEL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CHART,
      "chart",
      ATK_ROLE_CHART,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_CHART,
      ROLE_SYSTEM_CHART,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(DIALOG,
      "dialog",
      ATK_ROLE_DIALOG,
      NSAccessibilityWindowRole,  //There's a dialog subrole.
      ROLE_SYSTEM_DIALOG,
      ROLE_SYSTEM_DIALOG,
-     "android.app.Dialog",
+     java::SessionAccessibility::CLASSNAME_DIALOG,
      eNoNameRule)
 
 ROLE(BORDER,
      "border",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Unused on OS X.
      ROLE_SYSTEM_BORDER,
      ROLE_SYSTEM_BORDER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(GROUPING,
      "grouping",
      ATK_ROLE_PANEL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SEPARATOR,
      "separator",
      ATK_ROLE_SEPARATOR,
      NSAccessibilitySplitterRole,
      ROLE_SYSTEM_SEPARATOR,
      ROLE_SYSTEM_SEPARATOR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TOOLBAR,
      "toolbar",
      ATK_ROLE_TOOL_BAR,
      NSAccessibilityToolbarRole,
      ROLE_SYSTEM_TOOLBAR,
      ROLE_SYSTEM_TOOLBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(STATUSBAR,
      "statusbar",
      ATK_ROLE_STATUSBAR,
      NSAccessibilityUnknownRole,  //Doesn't exist on OS X (a status bar is its parts; a progressbar, a label, etc.)
      ROLE_SYSTEM_STATUSBAR,
      ROLE_SYSTEM_STATUSBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TABLE,
      "table",
      ATK_ROLE_TABLE,
      NSAccessibilityTableRole,
      ROLE_SYSTEM_TABLE,
      ROLE_SYSTEM_TABLE,
-     "android.widget.GridView",
+     java::SessionAccessibility::CLASSNAME_GRIDVIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(COLUMNHEADER,
      "columnheader",
      ATK_ROLE_COLUMN_HEADER,
      NSAccessibilityCellRole,
      ROLE_SYSTEM_COLUMNHEADER,
      ROLE_SYSTEM_COLUMNHEADER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(ROWHEADER,
      "rowheader",
      ATK_ROLE_ROW_HEADER,
      NSAccessibilityCellRole,
      ROLE_SYSTEM_ROWHEADER,
      ROLE_SYSTEM_ROWHEADER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(COLUMN,
      "column",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityColumnRole,
      ROLE_SYSTEM_COLUMN,
      ROLE_SYSTEM_COLUMN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(ROW,
      "row",
      ATK_ROLE_TABLE_ROW,
      NSAccessibilityRowRole,
      ROLE_SYSTEM_ROW,
      ROLE_SYSTEM_ROW,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(CELL,
      "cell",
      ATK_ROLE_TABLE_CELL,
      NSAccessibilityCellRole,
      ROLE_SYSTEM_CELL,
      ROLE_SYSTEM_CELL,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(LINK,
      "link",
      ATK_ROLE_LINK,
      @"AXLink",  //10.4+ the attr first define in SDK 10.4, so we define it here too. ROLE_LINK
      ROLE_SYSTEM_LINK,
      ROLE_SYSTEM_LINK,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(HELPBALLOON,
      "helpballoon",
      ATK_ROLE_UNKNOWN,
      @"AXHelpTag",
      ROLE_SYSTEM_HELPBALLOON,
      ROLE_SYSTEM_HELPBALLOON,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(CHARACTER,
      "character",
      ATK_ROLE_IMAGE,
      NSAccessibilityUnknownRole,  //Unused on OS X.
      ROLE_SYSTEM_CHARACTER,
      ROLE_SYSTEM_CHARACTER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(LIST,
      "list",
      ATK_ROLE_LIST,
      NSAccessibilityListRole,
      ROLE_SYSTEM_LIST,
      ROLE_SYSTEM_LIST,
-     "android.widget.ListView",
+     java::SessionAccessibility::CLASSNAME_LISTVIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(LISTITEM,
      "listitem",
      ATK_ROLE_LIST_ITEM,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_LISTITEM,
      ROLE_SYSTEM_LISTITEM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(OUTLINE,
      "outline",
      ATK_ROLE_TREE,
      NSAccessibilityOutlineRole,
      ROLE_SYSTEM_OUTLINE,
      ROLE_SYSTEM_OUTLINE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(OUTLINEITEM,
      "outlineitem",
      ATK_ROLE_TREE_ITEM,
      NSAccessibilityRowRole,
      ROLE_SYSTEM_OUTLINEITEM,
      ROLE_SYSTEM_OUTLINEITEM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(PAGETAB,
      "pagetab",
      ATK_ROLE_PAGE_TAB,
      NSAccessibilityRadioButtonRole,
      ROLE_SYSTEM_PAGETAB,
      ROLE_SYSTEM_PAGETAB,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(PROPERTYPAGE,
      "propertypage",
      ATK_ROLE_SCROLL_PANE,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_PROPERTYPAGE,
      ROLE_SYSTEM_PROPERTYPAGE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(INDICATOR,
      "indicator",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_INDICATOR,
      ROLE_SYSTEM_INDICATOR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(GRAPHIC,
      "graphic",
      ATK_ROLE_IMAGE,
      NSAccessibilityImageRole,
      ROLE_SYSTEM_GRAPHIC,
      ROLE_SYSTEM_GRAPHIC,
-     "android.widget.Image",
+     java::SessionAccessibility::CLASSNAME_IMAGE,
      eNoNameRule)
 
 ROLE(STATICTEXT,
      "statictext",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityStaticTextRole,
      ROLE_SYSTEM_STATICTEXT,
      ROLE_SYSTEM_STATICTEXT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TEXT_LEAF,
      "text leaf",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityStaticTextRole,
      ROLE_SYSTEM_TEXT,
      ROLE_SYSTEM_TEXT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PUSHBUTTON,
      "pushbutton",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityButtonRole,
      ROLE_SYSTEM_PUSHBUTTON,
      ROLE_SYSTEM_PUSHBUTTON,
-     "android.widget.Button",
+     java::SessionAccessibility::CLASSNAME_BUTTON,
      eNameFromSubtreeRule)
 
 ROLE(CHECKBUTTON,
      "checkbutton",
      ATK_ROLE_CHECK_BOX,
      NSAccessibilityCheckBoxRole,
      ROLE_SYSTEM_CHECKBUTTON,
      ROLE_SYSTEM_CHECKBUTTON,
-     "android.widget.CheckBox",
+     java::SessionAccessibility::CLASSNAME_CHECKBOX,
      eNameFromSubtreeRule)
 
 ROLE(RADIOBUTTON,
      "radiobutton",
      ATK_ROLE_RADIO_BUTTON,
      NSAccessibilityRadioButtonRole,
      ROLE_SYSTEM_RADIOBUTTON,
      ROLE_SYSTEM_RADIOBUTTON,
-     "android.widget.RadioButton",
+     java::SessionAccessibility::CLASSNAME_RADIOBUTTON,
      eNameFromSubtreeRule)
 
 // Equivalent of HTML select element with size="1". See also EDITCOMBOBOX.
 ROLE(COMBOBOX,
      "combobox",
      ATK_ROLE_COMBO_BOX,
      NSAccessibilityPopUpButtonRole,
      ROLE_SYSTEM_COMBOBOX,
      ROLE_SYSTEM_COMBOBOX,
-     "android.widget.Spinner",
+     java::SessionAccessibility::CLASSNAME_SPINNER,
      eNameFromValueRule)
 
 ROLE(DROPLIST,
      "droplist",
      ATK_ROLE_COMBO_BOX,
      NSAccessibilityPopUpButtonRole,
      ROLE_SYSTEM_DROPLIST,
      ROLE_SYSTEM_DROPLIST,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PROGRESSBAR,
      "progressbar",
      ATK_ROLE_PROGRESS_BAR,
      NSAccessibilityProgressIndicatorRole,
      ROLE_SYSTEM_PROGRESSBAR,
      ROLE_SYSTEM_PROGRESSBAR,
-     "android.widget.ProgressBar",
+     java::SessionAccessibility::CLASSNAME_PROGRESSBAR,
      eNameFromValueRule)
 
 ROLE(DIAL,
      "dial",
      ATK_ROLE_DIAL,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_DIAL,
      ROLE_SYSTEM_DIAL,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(HOTKEYFIELD,
      "hotkeyfield",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_HOTKEYFIELD,
      ROLE_SYSTEM_HOTKEYFIELD,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SLIDER,
      "slider",
      ATK_ROLE_SLIDER,
      NSAccessibilitySliderRole,
      ROLE_SYSTEM_SLIDER,
      ROLE_SYSTEM_SLIDER,
-     "android.widget.SeekBar",
+     java::SessionAccessibility::CLASSNAME_SEEKBAR,
      eNameFromValueRule)
 
 ROLE(SPINBUTTON,
      "spinbutton",
      ATK_ROLE_SPIN_BUTTON,
      NSAccessibilityIncrementorRole,  //Subroles: Increment/Decrement.
      ROLE_SYSTEM_SPINBUTTON,
      ROLE_SYSTEM_SPINBUTTON,
-     "android.view.View", // A composite widget
+     java::SessionAccessibility::CLASSNAME_VIEW, // A composite widget
      eNameFromValueRule)
 
 ROLE(DIAGRAM,
      "diagram",
      ATK_ROLE_IMAGE,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_DIAGRAM,
      ROLE_SYSTEM_DIAGRAM,
-     "android.widget.Image",
+     java::SessionAccessibility::CLASSNAME_IMAGE,
      eNoNameRule)
 
 ROLE(ANIMATION,
      "animation",
      ATK_ROLE_ANIMATION,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_ANIMATION,
      ROLE_SYSTEM_ANIMATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(EQUATION,
      "equation",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_EQUATION,
      ROLE_SYSTEM_EQUATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(BUTTONDROPDOWN,
      "buttondropdown",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityPopUpButtonRole,
      ROLE_SYSTEM_BUTTONDROPDOWN,
      ROLE_SYSTEM_BUTTONDROPDOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(BUTTONMENU,
      "buttonmenu",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityMenuButtonRole,
      ROLE_SYSTEM_BUTTONMENU,
      ROLE_SYSTEM_BUTTONMENU,
-     "android.widget.Spinner",
+     java::SessionAccessibility::CLASSNAME_SPINNER,
      eNameFromSubtreeRule)
 
 ROLE(BUTTONDROPDOWNGRID,
      "buttondropdowngrid",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_BUTTONDROPDOWNGRID,
      ROLE_SYSTEM_BUTTONDROPDOWNGRID,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(WHITESPACE,
      "whitespace",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_WHITESPACE,
      ROLE_SYSTEM_WHITESPACE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PAGETABLIST,
      "pagetablist",
      ATK_ROLE_PAGE_TAB_LIST,
      NSAccessibilityTabGroupRole,
      ROLE_SYSTEM_PAGETABLIST,
      ROLE_SYSTEM_PAGETABLIST,
-     "android.widget.TabWidget",
+     java::SessionAccessibility::CLASSNAME_TABWIDGET,
      eNoNameRule)
 
 ROLE(CLOCK,
      "clock",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,  //Unused on OS X
      ROLE_SYSTEM_CLOCK,
      ROLE_SYSTEM_CLOCK,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SPLITBUTTON,
      "splitbutton",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityButtonRole,
      ROLE_SYSTEM_SPLITBUTTON,
      ROLE_SYSTEM_SPLITBUTTON,
-     "android.widget.Button",
+     java::SessionAccessibility::CLASSNAME_BUTTON,
      eNoNameRule)
 
 ROLE(IPADDRESS,
      "ipaddress",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_IPADDRESS,
      ROLE_SYSTEM_IPADDRESS,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(ACCEL_LABEL,
      "accel label",
      ATK_ROLE_ACCEL_LABEL,
      NSAccessibilityStaticTextRole,
      ROLE_SYSTEM_STATICTEXT,
      ROLE_SYSTEM_STATICTEXT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(ARROW,
      "arrow",
      ATK_ROLE_ARROW,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_INDICATOR,
      ROLE_SYSTEM_INDICATOR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CANVAS,
      "canvas",
      ATK_ROLE_CANVAS,
      NSAccessibilityImageRole,
      USE_ROLE_STRING,
      IA2_ROLE_CANVAS,
-     "android.widget.Image",
+     java::SessionAccessibility::CLASSNAME_IMAGE,
      eNoNameRule)
 
 ROLE(CHECK_MENU_ITEM,
      "check menu item",
      ATK_ROLE_CHECK_MENU_ITEM,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_MENUITEM,
      IA2_ROLE_CHECK_MENU_ITEM,
-     "android.view.MenuItem",
+     java::SessionAccessibility::CLASSNAME_MENUITEM,
      eNameFromSubtreeRule)
 
 ROLE(COLOR_CHOOSER,
      "color chooser",
      ATK_ROLE_COLOR_CHOOSER,
      NSAccessibilityColorWellRole,
      ROLE_SYSTEM_DIALOG,
      IA2_ROLE_COLOR_CHOOSER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(DATE_EDITOR,
      "date editor",
      ATK_ROLE_DATE_EDITOR,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_DATE_EDITOR,
-     "android.widget.Spinner",
+     java::SessionAccessibility::CLASSNAME_SPINNER,
      eNoNameRule)
 
 ROLE(DESKTOP_ICON,
      "desktop icon",
      ATK_ROLE_DESKTOP_ICON,
      NSAccessibilityImageRole,
      USE_ROLE_STRING,
      IA2_ROLE_DESKTOP_ICON,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(DESKTOP_FRAME,
      "desktop frame",
      ATK_ROLE_DESKTOP_FRAME,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_DESKTOP_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(DIRECTORY_PANE,
      "directory pane",
      ATK_ROLE_DIRECTORY_PANE,
      NSAccessibilityBrowserRole,
      USE_ROLE_STRING,
      IA2_ROLE_DIRECTORY_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(FILE_CHOOSER,
      "file chooser",
      ATK_ROLE_FILE_CHOOSER,
      NSAccessibilityUnknownRole,  //Unused on OS X
      USE_ROLE_STRING,
      IA2_ROLE_FILE_CHOOSER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(FONT_CHOOSER,
      "font chooser",
      ATK_ROLE_FONT_CHOOSER,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_FONT_CHOOSER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CHROME_WINDOW,
      "chrome window",
      ATK_ROLE_FRAME,
      NSAccessibilityGroupRole,  //Contains the main Firefox UI
      ROLE_SYSTEM_APPLICATION,
      IA2_ROLE_FRAME,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(GLASS_PANE,
      "glass pane",
      ATK_ROLE_GLASS_PANE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_GLASS_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(HTML_CONTAINER,
      "html container",
      ATK_ROLE_HTML_CONTAINER,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(ICON,
      "icon",
      ATK_ROLE_ICON,
      NSAccessibilityImageRole,
      ROLE_SYSTEM_PUSHBUTTON,
      IA2_ROLE_ICON,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(LABEL,
      "label",
      ATK_ROLE_LABEL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_STATICTEXT,
      IA2_ROLE_LABEL,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(LAYERED_PANE,
      "layered pane",
      ATK_ROLE_LAYERED_PANE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_LAYERED_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(OPTION_PANE,
      "option pane",
      ATK_ROLE_OPTION_PANE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_OPTION_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PASSWORD_TEXT,
      "password text",
      ATK_ROLE_PASSWORD_TEXT,
      NSAccessibilityTextFieldRole,
      ROLE_SYSTEM_TEXT,
      ROLE_SYSTEM_TEXT,
-     "android.widget.EditText",
+     java::SessionAccessibility::CLASSNAME_EDITTEXT,
      eNoNameRule)
 
 ROLE(POPUP_MENU,
      "popup menu",
      ATK_ROLE_POPUP_MENU,
      NSAccessibilityUnknownRole,  //Unused
      ROLE_SYSTEM_MENUPOPUP,
      ROLE_SYSTEM_MENUPOPUP,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(RADIO_MENU_ITEM,
      "radio menu item",
      ATK_ROLE_RADIO_MENU_ITEM,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_MENUITEM,
      IA2_ROLE_RADIO_MENU_ITEM,
-     "android.view.MenuItem",
+     java::SessionAccessibility::CLASSNAME_MENUITEM,
      eNameFromSubtreeRule)
 
 ROLE(ROOT_PANE,
      "root pane",
      ATK_ROLE_ROOT_PANE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_ROOT_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SCROLL_PANE,
      "scroll pane",
      ATK_ROLE_SCROLL_PANE,
      NSAccessibilityScrollAreaRole,
      USE_ROLE_STRING,
      IA2_ROLE_SCROLL_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SPLIT_PANE,
      "split pane",
      ATK_ROLE_SPLIT_PANE,
      NSAccessibilitySplitGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_SPLIT_PANE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TABLE_COLUMN_HEADER,
      "table column header",
      ATK_ROLE_TABLE_COLUMN_HEADER,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_COLUMNHEADER,
      ROLE_SYSTEM_COLUMNHEADER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(TABLE_ROW_HEADER,
      "table row header",
      ATK_ROLE_TABLE_ROW_HEADER,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_ROWHEADER,
      ROLE_SYSTEM_ROWHEADER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(TEAR_OFF_MENU_ITEM,
      "tear off menu item",
      ATK_ROLE_TEAR_OFF_MENU_ITEM,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_MENUITEM,
      IA2_ROLE_TEAR_OFF_MENU,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(TERMINAL,
      "terminal",
      ATK_ROLE_TERMINAL,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_TERMINAL,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TEXT_CONTAINER,
      "text container",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_TEXT_FRAME,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(TOGGLE_BUTTON,
      "toggle button",
      ATK_ROLE_TOGGLE_BUTTON,
      NSAccessibilityButtonRole,
      ROLE_SYSTEM_PUSHBUTTON,
      IA2_ROLE_TOGGLE_BUTTON,
-     "android.widget.ToggleButton",
+     java::SessionAccessibility::CLASSNAME_TOGGLEBUTTON,
      eNameFromSubtreeRule)
 
 ROLE(TREE_TABLE,
      "tree table",
      ATK_ROLE_TREE_TABLE,
      NSAccessibilityTableRole,
      ROLE_SYSTEM_OUTLINE,
      ROLE_SYSTEM_OUTLINE,
-     "android.widget.GridView",
+     java::SessionAccessibility::CLASSNAME_GRIDVIEW,
      eNoNameRule)
 
 ROLE(VIEWPORT,
      "viewport",
      ATK_ROLE_VIEWPORT,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_PANE,
      IA2_ROLE_VIEW_PORT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(HEADER,
      "header",
      ATK_ROLE_HEADER,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_HEADER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(FOOTER,
      "footer",
      ATK_ROLE_FOOTER,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_FOOTER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PARAGRAPH,
      "paragraph",
      ATK_ROLE_PARAGRAPH,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_PARAGRAPH,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(RULER,
      "ruler",
      ATK_ROLE_RULER,
      @"AXRuler",  //10.4+ only, so we re-define the constant.
      USE_ROLE_STRING,
      IA2_ROLE_RULER,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(AUTOCOMPLETE,
      "autocomplete",
      ATK_ROLE_AUTOCOMPLETE,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_COMBOBOX,
      ROLE_SYSTEM_COMBOBOX,
-     "android.widget.EditText",
+     java::SessionAccessibility::CLASSNAME_EDITTEXT,
      eNoNameRule)
 
 ROLE(EDITBAR,
      "editbar",
      ATK_ROLE_EDITBAR,
      NSAccessibilityTextFieldRole,
      ROLE_SYSTEM_TEXT,
      IA2_ROLE_EDITBAR,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(ENTRY,
      "entry",
      ATK_ROLE_ENTRY,
      NSAccessibilityTextFieldRole,
      ROLE_SYSTEM_TEXT,
      ROLE_SYSTEM_TEXT,
-     "android.widget.EditText",
+     java::SessionAccessibility::CLASSNAME_EDITTEXT,
      eNameFromValueRule)
 
 ROLE(CAPTION,
      "caption",
      ATK_ROLE_CAPTION,
      NSAccessibilityStaticTextRole,
      USE_ROLE_STRING,
      IA2_ROLE_CAPTION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(NON_NATIVE_DOCUMENT,
      "non-native document",
      ATK_ROLE_DOCUMENT_FRAME,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      ROLE_SYSTEM_DOCUMENT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(HEADING,
      "heading",
      ATK_ROLE_HEADING,
      @"AXHeading",
      USE_ROLE_STRING,
      IA2_ROLE_HEADING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(PAGE,
      "page",
      ATK_ROLE_PAGE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_PAGE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SECTION,
      "section",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_SECTION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(REDUNDANT_OBJECT,
      "redundant object",
      ATK_ROLE_REDUNDANT_OBJECT,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_REDUNDANT_OBJECT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(FORM,
      "form",
      ATK_ROLE_FORM,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_FORM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(IME,
      "ime",
      ATK_ROLE_INPUT_METHOD_WINDOW,
      NSAccessibilityUnknownRole,
      USE_ROLE_STRING,
      IA2_ROLE_INPUT_METHOD_WINDOW,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(APP_ROOT,
      "app root",
      ATK_ROLE_APPLICATION,
      NSAccessibilityUnknownRole,  //Unused on OS X
      ROLE_SYSTEM_APPLICATION,
      ROLE_SYSTEM_APPLICATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(PARENT_MENUITEM,
      "parent menuitem",
      ATK_ROLE_MENU,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_MENUITEM,
      ROLE_SYSTEM_MENUITEM,
-     "android.view.MenuItem",
+     java::SessionAccessibility::CLASSNAME_MENUITEM,
      eNameFromSubtreeRule)
 
 ROLE(CALENDAR,
      "calendar",
      ATK_ROLE_CALENDAR,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_CLIENT,
      ROLE_SYSTEM_CLIENT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(COMBOBOX_LIST,
      "combobox list",
      ATK_ROLE_MENU,
      NSAccessibilityMenuRole,
      ROLE_SYSTEM_LIST,
      ROLE_SYSTEM_LIST,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(COMBOBOX_OPTION,
      "combobox option",
      ATK_ROLE_MENU_ITEM,
      NSAccessibilityMenuItemRole,
      ROLE_SYSTEM_LISTITEM,
      ROLE_SYSTEM_LISTITEM,
-     "android.view.MenuItem",
+     java::SessionAccessibility::CLASSNAME_MENUITEM,
      eNameFromSubtreeRule)
 
 ROLE(IMAGE_MAP,
      "image map",
      ATK_ROLE_IMAGE,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_GRAPHIC,
      ROLE_SYSTEM_GRAPHIC,
-     "android.widget.Image",
+     java::SessionAccessibility::CLASSNAME_IMAGE,
      eNoNameRule)
 
 ROLE(OPTION,
      "listbox option",
      ATK_ROLE_LIST_ITEM,
      NSAccessibilityStaticTextRole,
      ROLE_SYSTEM_LISTITEM,
      ROLE_SYSTEM_LISTITEM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(RICH_OPTION,
      "listbox rich option",
      ATK_ROLE_LIST_ITEM,
      NSAccessibilityRowRole,
      ROLE_SYSTEM_LISTITEM,
      ROLE_SYSTEM_LISTITEM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(LISTBOX,
      "listbox",
      ATK_ROLE_LIST_BOX,
      NSAccessibilityListRole,
      ROLE_SYSTEM_LIST,
      ROLE_SYSTEM_LIST,
-     "android.widget.ListView",
+     java::SessionAccessibility::CLASSNAME_LISTVIEW,
      eNoNameRule)
 
 ROLE(FLAT_EQUATION,
      "flat equation",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityUnknownRole,
      ROLE_SYSTEM_EQUATION,
      ROLE_SYSTEM_EQUATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(GRID_CELL,
      "gridcell",
      ATK_ROLE_TABLE_CELL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_CELL,
      ROLE_SYSTEM_CELL,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(EMBEDDED_OBJECT,
      "embedded object",
      ATK_ROLE_PANEL,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_EMBEDDED_OBJECT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(NOTE,
      "note",
      ATK_ROLE_COMMENT,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_NOTE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(FIGURE,
      "figure",
      ATK_ROLE_PANEL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CHECK_RICH_OPTION,
      "check rich option",
      ATK_ROLE_CHECK_BOX,
      NSAccessibilityCheckBoxRole,
      ROLE_SYSTEM_CHECKBUTTON,
      ROLE_SYSTEM_CHECKBUTTON,
-     "android.widget.CheckBox",
+     java::SessionAccessibility::CLASSNAME_CHECKBOX,
      eNameFromSubtreeRule)
 
 ROLE(DEFINITION_LIST,
      "definitionlist",
      ATK_ROLE_LIST,
      NSAccessibilityListRole,
      ROLE_SYSTEM_LIST,
      ROLE_SYSTEM_LIST,
-     "android.widget.ListView",
+     java::SessionAccessibility::CLASSNAME_LISTVIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(TERM,
      "term",
      ATK_ROLE_DESCRIPTION_TERM,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_LISTITEM,
      ROLE_SYSTEM_LISTITEM,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(DEFINITION,
      "definition",
      ATK_ROLE_PARAGRAPH,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_PARAGRAPH,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(KEY,
      "key",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityButtonRole,
      ROLE_SYSTEM_PUSHBUTTON,
      ROLE_SYSTEM_PUSHBUTTON,
-     "android.widget.Button",
+     java::SessionAccessibility::CLASSNAME_BUTTON,
      eNameFromSubtreeRule)
 
 ROLE(SWITCH,
      "switch",
      ATK_ROLE_TOGGLE_BUTTON,
      NSAccessibilityCheckBoxRole,
      ROLE_SYSTEM_CHECKBUTTON,
      IA2_ROLE_TOGGLE_BUTTON,
-     "android.widget.CheckBox",
+     java::SessionAccessibility::CLASSNAME_CHECKBOX,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_MATH,
      "math",
      ATK_ROLE_MATH,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_EQUATION,
      ROLE_SYSTEM_EQUATION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_IDENTIFIER,
      "mathml identifier",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_NUMBER,
      "mathml number",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_OPERATOR,
      "mathml operator",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_TEXT,
      "mathml text",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_STRING_LITERAL,
      "mathml string literal",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_GLYPH,
      "mathml glyph",
      ATK_ROLE_IMAGE,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.widget.Image",
+     java::SessionAccessibility::CLASSNAME_IMAGE,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_ROW,
      "mathml row",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_FRACTION,
      "mathml fraction",
      ATK_ROLE_MATH_FRACTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_SQUARE_ROOT,
      "mathml square root",
      ATK_ROLE_MATH_ROOT,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_ROOT,
      "mathml root",
      ATK_ROLE_MATH_ROOT,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_FENCED,
      "mathml fenced",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_ENCLOSED,
      "mathml enclosed",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STYLE,
      "mathml style",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_SUB,
      "mathml sub",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_SUP,
      "mathml sup",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_SUB_SUP,
      "mathml sub sup",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_UNDER,
      "mathml under",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_OVER,
      "mathml over",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_UNDER_OVER,
      "mathml under over",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_MULTISCRIPTS,
      "mathml multiscripts",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_TABLE,
      "mathml table",
      ATK_ROLE_TABLE,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.widget.GridView",
+     java::SessionAccessibility::CLASSNAME_GRIDVIEW,
      eNoNameRule)
 
 ROLE(MATHML_LABELED_ROW,
      "mathml labeled row",
      ATK_ROLE_TABLE_ROW,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_TABLE_ROW,
      "mathml table row",
      ATK_ROLE_TABLE_ROW,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_CELL,
      "mathml cell",
      ATK_ROLE_TABLE_CELL,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_ACTION,
      "mathml action",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_ERROR,
      "mathml error",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK,
      "mathml stack",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_LONG_DIVISION,
      "mathml long division",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK_GROUP,
      "mathml stack group",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK_ROW,
      "mathml stack row",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK_CARRIES,
      "mathml stack carries",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK_CARRY,
      "mathml stack carry",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(MATHML_STACK_LINE,
      "mathml stack line",
      ATK_ROLE_UNKNOWN,
      NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(RADIO_GROUP,
      "grouping",
      ATK_ROLE_PANEL,
      NSAccessibilityRadioGroupRole,
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(TEXT,
      "text",
      ATK_ROLE_STATIC,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_TEXT_FRAME,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
 
 ROLE(DETAILS,
      "details",
      ATK_ROLE_PANEL,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(SUMMARY,
      "summary",
      ATK_ROLE_PUSH_BUTTON,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_PUSHBUTTON,
      ROLE_SYSTEM_PUSHBUTTON,
-     "android.widget.Button",
+     java::SessionAccessibility::CLASSNAME_BUTTON,
      eNameFromSubtreeRule)
 
 ROLE(LANDMARK,
      "landmark",
      ATK_ROLE_LANDMARK,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_LANDMARK,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(NAVIGATION,
      "navigation",
      ATK_ROLE_LANDMARK,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_LANDMARK,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(FOOTNOTE,
      "footnote",
      ATK_ROLE_FOOTNOTE,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_FOOTNOTE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(ARTICLE,
      "article",
      ATK_ROLE_ARTICLE,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_DOCUMENT,
      ROLE_SYSTEM_DOCUMENT,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(REGION,
      "region",
      ATK_ROLE_LANDMARK,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_LANDMARK,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 // A composite widget with a text input and popup. Used for ARIA role combobox.
 // See also COMBOBOX.
 ROLE(EDITCOMBOBOX,
      "editcombobox",
      ATK_ROLE_COMBO_BOX,
      NSAccessibilityComboBoxRole,
      ROLE_SYSTEM_COMBOBOX,
      ROLE_SYSTEM_COMBOBOX,
-     "android.widget.EditText",
+     java::SessionAccessibility::CLASSNAME_EDITTEXT,
      eNameFromValueRule)
 
 ROLE(BLOCKQUOTE,
      "blockquote",
      ATK_ROLE_BLOCK_QUOTE,
      NSAccessibilityGroupRole,
      ROLE_SYSTEM_GROUPING,
      IA2_ROLE_BLOCK_QUOTE,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CONTENT_DELETION,
      "content deletion",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_CONTENT_DELETION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)
 
 ROLE(CONTENT_INSERTION,
      "content insertion",
      ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_CONTENT_INSERTION,
-     "android.view.View",
+     java::SessionAccessibility::CLASSNAME_VIEW,
      eNoNameRule)

--- a/browser/base/content/aboutNetError-new.xhtml
+++ b/browser/base/content/aboutNetError-new.xhtml
@@ -22,17 +22,17 @@
     <meta http-equiv="Content-Security-Policy" content="default-src chrome:" />
     <title>&loadError.label;</title>
     <link rel="stylesheet" href="chrome://browser/skin/aboutNetError-new.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
     <link rel="icon" id="favicon" href="chrome://global/skin/icons/warning.svg"/>
   </head>
 
-  <body dir="&locale.dir;">
+  <body data-new-error-pages-enabled="true" dir="&locale.dir;">
     <!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
     <div id="errorContainer">
       <div id="errorPageTitlesContainer">
         <span id="ept_nssBadCert">&certerror.pagetitle2;</span>
         <span id="ept_nssBadCert_sts">&certerror.sts.pagetitle;</span>
         <span id="ept_captivePortal">&captivePortal.title;</span>
         <span id="ept_dnsNotFound">&dnsNotFound.pageTitle;</span>
         <span id="ept_malformedURI">&malformedURI.pageTitle;</span>

--- a/browser/base/content/aboutNetError.js
+++ b/browser/base/content/aboutNetError.js
@@ -10,16 +10,17 @@
 // document.location.href gets the current URI off the docshell,
 // which is the URL displayed in the location bar, i.e.
 // the URI that the user attempted to load.
 
 let searchParams = new URLSearchParams(document.documentURI.split("?")[1]);
 
 // Set to true on init if the error code is nssBadCert.
 let gIsCertError;
+let gNewErrorPagesEnabled;
 
 function getErrorCode() {
   return searchParams.get("e");
 }
 
 function getCSSClass() {
   return searchParams.get("s");
 }
@@ -124,19 +125,21 @@ function disallowCertOverridesIfNeeded()
   // host and the cert is bad (STS Spec section 7.3) or if the
   // certerror is in a frame (bug 633691).
   if (cssClass == "badStsCert" || window != top) {
     document.getElementById("exceptionDialogButton").setAttribute("hidden", "true");
   }
   if (cssClass == "badStsCert") {
     document.getElementById("badStsCertExplanation").removeAttribute("hidden");
 
-    let stsReturnButtonText = document.getElementById("stsReturnButtonText").textContent;
-    document.getElementById("returnButton").textContent = stsReturnButtonText;
-    document.getElementById("advancedPanelReturnButton").textContent = stsReturnButtonText;
+    if (gNewErrorPagesEnabled) {
+      let stsReturnButtonText = document.getElementById("stsReturnButtonText").textContent;
+      document.getElementById("returnButton").textContent = stsReturnButtonText;
+      document.getElementById("advancedPanelReturnButton").textContent = stsReturnButtonText;
+    }
   }
 }
 
 function initPage() {
   var err = getErrorCode();
   // List of error pages with an illustration.
   let illustratedErrors = [
     "malformedURI", "dnsNotFound", "connectionFailure", "netInterrupt",
@@ -145,29 +148,30 @@ function initPage() {
   if (illustratedErrors.includes(err)) {
     document.body.classList.add("illustrated", err);
   }
   if (err == "blockedByPolicy") {
     document.body.classList.add("blocked");
   }
 
   gIsCertError = (err == "nssBadCert");
+  gNewErrorPagesEnabled = !!document.body.dataset.newErrorPagesEnabled;
   // Only worry about captive portals if this is a cert error.
   let showCaptivePortalUI = isCaptive() && gIsCertError;
   if (showCaptivePortalUI) {
     err = "captivePortal";
   }
 
   let l10nErrId = err;
   let className = getCSSClass();
   if (className) {
     document.body.classList.add(className);
   }
 
-  if (gIsCertError && className == "badStsCert") {
+  if (gNewErrorPagesEnabled && gIsCertError && className == "badStsCert") {
     l10nErrId += "_sts";
   }
 
   let pageTitle = document.getElementById("ept_" + l10nErrId);
   if (pageTitle) {
     document.title = pageTitle.textContent;
   }
 

--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -401,36 +401,28 @@ window._gBrowser = {
   get webProgress() {
     return this.selectedBrowser.webProgress;
   },
 
   get contentWindow() {
     return this.selectedBrowser.contentWindow;
   },
 
-  get contentWindowAsCPOW() {
-    return this.selectedBrowser.contentWindowAsCPOW;
-  },
-
   get sessionHistory() {
     return this.selectedBrowser.sessionHistory;
   },
 
   get markupDocumentViewer() {
     return this.selectedBrowser.markupDocumentViewer;
   },
 
   get contentDocument() {
     return this.selectedBrowser.contentDocument;
   },
 
-  get contentDocumentAsCPOW() {
-    return this.selectedBrowser.contentDocumentAsCPOW;
-  },
-
   get contentTitle() {
     return this.selectedBrowser.contentTitle;
   },
 
   get contentPrincipal() {
     return this.selectedBrowser.contentPrincipal;
   },
 

--- a/browser/base/content/test/about/browser_aboutCertError.js
+++ b/browser/base/content/test/about/browser_aboutCertError.js
@@ -453,16 +453,17 @@ add_task(async function checkUnknownIssu
     });
     ok(href.endsWith("security-error"), "security-error in the Learn More URL");
 
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 });
 
 add_task(async function checkCautionClass() {
+  Services.prefs.setBoolPref("browser.security.newcerterrorpage.enabled", true);
   info("Checking that are potentially more dangerous get a 'caution' class");
   for (let useFrame of [false, true]) {
     let tab = await openErrorPage(UNKNOWN_ISSUER, useFrame);
     let browser = tab.linkedBrowser;
 
     await ContentTask.spawn(browser, {frame: useFrame}, async function({frame}) {
       let doc = frame ? content.document.querySelector("iframe").contentDocument : content.document;
       is(doc.body.classList.contains("caution"), !frame, `Cert error body has ${frame ? "no" : ""} caution class`);
@@ -475,19 +476,21 @@ add_task(async function checkCautionClas
 
     await ContentTask.spawn(browser, {frame: useFrame}, async function({frame}) {
       let doc = frame ? content.document.querySelector("iframe").contentDocument : content.document;
       ok(!doc.body.classList.contains("caution"), "Cert error body has no caution class");
     });
 
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
+  Services.prefs.clearUserPref("browser.security.newcerterrorpage.enabled");
 });
 
 add_task(async function checkViewCertificate() {
+  Services.prefs.setBoolPref("browser.security.newcerterrorpage.enabled", true);
   info("Loading a cert error and checking that the certificate can be shown.");
   for (let useFrame of [false, true]) {
     let tab = await openErrorPage(UNKNOWN_ISSUER, useFrame);
     let browser = tab.linkedBrowser;
 
     let dialogOpened = BrowserTestUtils.domWindowOpened();
 
     await ContentTask.spawn(browser, {frame: useFrame}, async function({frame}) {
@@ -501,16 +504,17 @@ add_task(async function checkViewCertifi
     is(win.document.documentURI, "chrome://pippki/content/certViewer.xul",
       "Opened the cert viewer dialog");
     is(win.document.getElementById("commonname").value, "self-signed.example.com",
       "Shows the correct certificate in the dialog");
     win.close();
 
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
+  Services.prefs.clearUserPref("browser.security.newcerterrorpage.enabled");
 });
 
 function getCertChain(securityInfoAsString) {
   let certChain = "";
   const serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
                        .getService(Ci.nsISerializationHelper);
   let securityInfo = serhelper.deserializeObject(securityInfoAsString);
   securityInfo.QueryInterface(Ci.nsITransportSecurityInfo);

--- a/browser/base/content/test/performance/browser_preferences_usage.js
+++ b/browser/base/content/test/performance/browser_preferences_usage.js
@@ -93,17 +93,17 @@ add_task(async function startup() {
     "layout.css.dpi": {
       min: 45,
       max: 81,
     },
     "network.loadinfo.skip_type_assertion": {
       // This is accessed in debug only.
     },
     "extensions.getAddons.cache.enabled": {
-      min: 5,
+      min: 4,
       max: 55,
     },
     "chrome.override_package.global": {
       min: 0,
       max: 50,
     },
   };
 

--- a/browser/base/content/test/siteIdentity/browser.ini
+++ b/browser/base/content/test/siteIdentity/browser.ini
@@ -104,8 +104,9 @@ tags = mcb
 support-files =
   test_no_mcb_for_onions.html
 [browser_check_identity_state.js]
 [browser_iframe_navigation.js]
 support-files =
   iframe_navigation.html
 [browser_navigation_failures.js]
 [browser_secure_transport_insecure_scheme.js]
+[browser_ignore_same_page_navigation.js]

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/siteIdentity/browser_ignore_same_page_navigation.js
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that the nsISecureBrowserUI implementation doesn't send extraneous OnSecurityChange events
+// when it receives OnLocationChange events with the LOCATION_CHANGE_SAME_DOCUMENT flag set.
+
+add_task(async function() {
+  await BrowserTestUtils.withNewTab("about:blank", async (browser) => {
+    let onLocationChangeCount = 0;
+    let onSecurityChangeCount = 0;
+    let progressListener = {
+      onStateChange() {},
+      onLocationChange() {
+        onLocationChangeCount++;
+      },
+      onSecurityChange() {
+        onSecurityChangeCount++;
+      },
+      onProgressChange() {},
+      onStatusChange() {},
+
+      QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+                                              Ci.nsISupportsWeakReference]),
+    };
+    browser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_ALL);
+
+    let uri = getRootDirectory(gTestPath).replace("chrome://mochitests/content",
+                                                  "https://example.com") + "dummy_page.html";
+    BrowserTestUtils.loadURI(browser, uri);
+    await BrowserTestUtils.browserLoaded(browser, false, uri);
+    is(onLocationChangeCount, 1, "should have 1 onLocationChange event");
+    is(onSecurityChangeCount, 1, "should have 1 onSecurityChange event");
+    await ContentTask.spawn(browser, null, async () => {
+      content.history.pushState({}, "", "https://example.com");
+    });
+    is(onLocationChangeCount, 2, "should have 2 onLocationChange events");
+    is(onSecurityChangeCount, 1, "should still have only 1 onSecurityChange event");
+  });
+});

--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -270,17 +270,24 @@ trackResourcePrefix("formautofill");
 trackChromeUri("chrome://formautofill/content/");
 
 function parseManifest(manifestUri) {
   return fetchFile(manifestUri.spec).then(data => {
     for (let line of data.split("\n")) {
       let [type, ...argv] = line.split(/\s+/);
       if (type == "content" || type == "skin" || type == "locale") {
         let chromeUri = `chrome://${argv[0]}/${type}/`;
-        trackChromeUri(chromeUri);
+        // The webcompat reporter's locale directory may not exist if
+        // the addon is preffed-off, and since it's a hack until we
+        // get bz1425104 landed, we'll just skip it for now.
+        if (chromeUri === "chrome://webcompat-reporter/locale/") {
+          gChromeMap.set("chrome://webcompat-reporter/locale/", true);
+        } else {
+          trackChromeUri(chromeUri);
+        }
       } else if (type == "override" || type == "overlay") {
         // Overlays aren't really overrides, but behave the same in
         // that the overlay is only referenced if the original xul
         // file is referenced somewhere.
         let os = "os=" + Services.appinfo.OS;
         if (!argv.some(s => s.startsWith("os=") && s != os)) {
           gOverrideMap.set(Services.io.newURI(argv[1]).specIgnoringRef,
                            Services.io.newURI(argv[0]).specIgnoringRef);

--- a/browser/components/newtab/.eslintrc.js
+++ b/browser/components/newtab/.eslintrc.js
@@ -184,17 +184,17 @@ module.exports = {
     "no-use-before-define": 2,
     "no-useless-computed-key": 2,
     "no-useless-constructor": 2,
     "no-useless-rename": 2,
     "no-var": 2,
     "no-void": 2,
     "no-warning-comments": 0, // TODO: Change to `1`?
     "nonblock-statement-body-position": 2,
-    "object-curly-newline": [2, {"multiline": true}],
+    "object-curly-newline": [2, {"multiline": true, "consistent": true}],
     "object-curly-spacing": [2, "never"],
     "object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
     "one-var": [2, "never"],
     "one-var-declaration-per-line": [2, "initializations"],
     "operator-assignment": [2, "always"],
     "operator-linebreak": [2, "after"],
     "padded-blocks": [2, "never"],
     "padding-line-between-statements": 0,

--- a/browser/components/newtab/.sass-lint.yml
+++ b/browser/components/newtab/.sass-lint.yml
@@ -12,16 +12,16 @@ rules:
   force-element-nesting: 0
   force-pseudo-nesting: 0
   hex-notation: [2, {style: uppercase}]
   indentation: [2, {size: 2}]
   leading-zero: [2, {include: true}]
   mixins-before-declarations: [2, {exclude: [breakpoint, mq]}]
   nesting-depth: [2, {max-depth: 4}]
   no-debug: 1
-  no-disallowed-properties: [1, {properties: [text-transform]}]
+  no-disallowed-properties: [1, {properties: [margin-left, margin-right, text-transform]}]
   no-duplicate-properties: 2
   no-misspelled-properties: [2, {extra-properties: [-moz-context-properties]}]
   no-url-domains: 0
   no-vendor-prefixes: 0
   no-warn: 1
   placeholder-in-extend: 2
   property-sort-order: 0

--- a/browser/components/newtab/CODEOWNERS
+++ b/browser/components/newtab/CODEOWNERS
@@ -1,2 +1,2 @@
 # flod as main contact for string changes
-locales/en-US/strings.properties @flodolo
+locales-src/en-US/strings.properties @flodolo

--- a/browser/components/newtab/bin/locales.js
+++ b/browser/components/newtab/bin/locales.js
@@ -1,9 +1,15 @@
-exports.DEFAULT_LOCALE = "en-US";
+if (!process.env.npm_lifecycle_event) {
+  throw Error("You should only run this from npm script contexts");
+}
+
+exports.DEFAULT_LOCALE = process.env.npm_package_config_default_locale;
+
+exports.LOCALES_SOURCE_DIRECTORY = process.env.npm_package_config_locales_dir;
 
 // This locales list is to find any similar locales that we can reuse strings
 // instead of falling back to the default, e.g., use bn-BD strings for bn-IN.
 // https://hg.mozilla.org/mozilla-central/file/tip/browser/locales/l10n.toml
 exports.CENTRAL_LOCALES = [
   "ach",
   "af",
   "an",

--- a/browser/components/newtab/bin/strings-import.js
+++ b/browser/components/newtab/bin/strings-import.js
@@ -2,17 +2,17 @@
 "use strict";
 
 /* eslint-disable no-console */
 const fetch = require("node-fetch");
 
 /* globals cd, ls, mkdir, rm, ShellString */
 require("shelljs/global");
 
-const {CENTRAL_LOCALES, DEFAULT_LOCALE} = require("./locales");
+const {CENTRAL_LOCALES, DEFAULT_LOCALE, LOCALES_SOURCE_DIRECTORY} = require("./locales");
 const L10N_CENTRAL = "https://hg.mozilla.org/l10n-central";
 const PROPERTIES_PATH = "raw-file/default/browser/chrome/browser/activity-stream/newtab.properties";
 const STRINGS_FILE = "strings.properties";
 
 // Get all the locales in l10n-central
 async function getLocales() {
   console.log(`Getting locales from ${L10N_CENTRAL}`);
 
@@ -69,19 +69,19 @@ async function saveProperties(locale) {
   cd("..");
 
   // Indicate that we were successful in saving
   return "";
 }
 
 // Replace and update each locale's strings
 async function updateLocales() {
-  console.log("Switching to and deleting existing l10n tree under: locales");
+  console.log(`Switching to and deleting existing l10n tree under: ${LOCALES_SOURCE_DIRECTORY}`);
 
-  cd("locales");
+  cd(LOCALES_SOURCE_DIRECTORY);
   ls().forEach(dir => {
     // Keep the default/source locale as it might have newer strings
     if (dir !== DEFAULT_LOCALE) {
       rm("-r", dir);
     }
   });
 
   // Save the properties file for each locale one at a time to avoid too many

--- a/browser/components/newtab/content-src/asrouter/asrouter-content.jsx
+++ b/browser/components/newtab/content-src/asrouter/asrouter-content.jsx
@@ -1,24 +1,26 @@
 import {actionCreators as ac} from "common/Actions.jsm";
 import {OUTGOING_MESSAGE_NAME as AS_GENERAL_OUTGOING_MESSAGE_NAME} from "content-src/lib/init-store";
 import {generateMessages} from "./rich-text-strings";
 import {ImpressionsWrapper} from "./components/ImpressionsWrapper/ImpressionsWrapper";
 import {LocalizationProvider} from "fluent-react";
 import {OnboardingMessage} from "./templates/OnboardingMessage/OnboardingMessage";
 import React from "react";
 import ReactDOM from "react-dom";
+import {SendToDeviceSnippet} from "./templates/SendToDeviceSnippet/SendToDeviceSnippet";
 import {SimpleSnippet} from "./templates/SimpleSnippet/SimpleSnippet";
 import {SubmitFormSnippet} from "./templates/SubmitFormSnippet/SubmitFormSnippet";
 
 // Key names matching schema name of templates
 const SnippetComponents = {
   simple_snippet: SimpleSnippet,
   newsletter_snippet: props => <SubmitFormSnippet {...props} form_method="POST" />,
   fxa_signup_snippet: props => <SubmitFormSnippet {...props} form_method="GET" />,
+  send_to_device_snippet: SendToDeviceSnippet,
 };
 
 const INCOMING_MESSAGE_NAME = "ASRouter:parent-to-child";
 const OUTGOING_MESSAGE_NAME = "ASRouter:child-to-parent";
 const ASR_CONTAINER_ID = "asr-newtab-container";
 
 export const ASRouterUtils = {
   addListener(listener) {
@@ -124,17 +126,17 @@ export class ASRouterUISurface extends R
     };
     const action = {
       type: event.target.dataset.action,
       data: {args: event.target.dataset.args},
     };
     if (action.type) {
       ASRouterUtils.executeAction(action);
     }
-    if (!this.state.message.content.do_not_autoblock) {
+    if (!this.state.message.content.do_not_autoblock && !event.target.dataset.do_not_autoblock) {
       ASRouterUtils.blockById(this.state.message.id);
     }
     if (this.state.message.provider !== "preview") {
       this.sendUserActionTelemetry({event: "CLICK_BUTTON", ...metric});
     }
   }
 
   onBlockById(id) {

--- a/browser/components/newtab/content-src/asrouter/components/Button/_Button.scss
+++ b/browser/components/newtab/content-src/asrouter/components/Button/_Button.scss
@@ -1,25 +1,26 @@
 .ASRouterButton {
+  font-weight: bold;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid var(--newtab-border-secondary-color);
   background-color: var(--newtab-button-secondary-color);
   font-family: inherit;
   padding: 8px 15px;
   margin-inline-start: 12px;
   color: inherit;
   cursor: pointer;
 
   .tall & {
     margin-inline-start: 20px;
   }
 
   &.primary {
-    border: 1px solid var(--newtab-border-primary-color);
+    border: 1px solid var(--newtab-button-primary-color);
     background-color: var(--newtab-button-primary-color);
     color: $grey-10;
   }
 
   &.secondary {
     background: var(--newtab-button-secondary-color);
     border: 1px solid var(--newtab-border-primary-color);
     font-size: 14px;

--- a/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss
+++ b/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss
@@ -16,19 +16,19 @@
 
   &.active {
     display: block;
   }
 }
 
 .modalOverlayInner {
   width: 960px;
-  height: 510px;
+  height: 570px;
   position: fixed;
-  top: calc(50% - 255px); // halfway down minus half the height of the modal
+  top: calc(50% - 285px); // halfway down minus half the height of the modal
   left: calc(50% - 480px); // halfway across minus half the width of the modal
   background: $white;
   box-shadow: 0 1px 15px 0 $black-30;
   border-radius: 4px;
   display: none;
   z-index: 1101;
 
 
@@ -90,19 +90,19 @@
 
     // if modal is narrow enough, footer becomes sticky
     @media(max-width: 650px) and (max-height: 600px) {
       position: sticky;
     }
 
     .modalButton {
       margin-top: 20px;
-      width: 150px;
+      min-width: 150px;
       height: 30px;
-      padding: 4px 0 6px;
+      padding: 4px 30px 6px;
       font-size: 15px;
 
       &:focus,
       &.active,
       &:hover {
         box-shadow: 0 0 0 5px $grey-30;
         transition: box-shadow 150ms;
       }

--- a/browser/components/newtab/content-src/asrouter/components/RichText/RichText.jsx
+++ b/browser/components/newtab/content-src/asrouter/components/RichText/RichText.jsx
@@ -12,40 +12,42 @@ const ALLOWED_TAGS = {
   em: <em />,
   br: <br />,
 };
 
 /**
  * Transform an object (tag name: {url}) into (tag name: anchor) where the url
  * is used as href, in order to render links inside a Fluent.Localized component.
  */
-export function convertLinks(links, sendClick) {
+export function convertLinks(links, sendClick, autoBlock) {
   if (links) {
     return Object.keys(links).reduce((acc, linkTag) => {
       const {action} = links[linkTag];
       // Setting the value to false will not include the attribute in the anchor
       const url = action ? false : safeURI(links[linkTag].url);
 
       acc[linkTag] = (<a href={url}
+        target={autoBlock === false ? "_blank" : ""}
         data-metric={links[linkTag].metric}
         data-action={action}
         data-args={links[linkTag].args}
+        data-do_not_autoblock={autoBlock === false}
         onClick={sendClick} />);
       return acc;
     }, {});
   }
 
   return null;
 }
 
 /**
  * Message wrapper used to sanitize markup and render HTML.
  */
 export function RichText(props) {
   if (!RICH_TEXT_KEYS.includes(props.localization_id)) {
     throw new Error(`ASRouter: ${props.localization_id} is not a valid rich text property. If you want it to be processed, you need to add it to asrouter/rich-text-strings.js`);
   }
   return (
-    <Localized id={props.localization_id} {...ALLOWED_TAGS} {...convertLinks(props.links, props.sendClick)}>
+    <Localized id={props.localization_id} {...ALLOWED_TAGS} {...convertLinks(props.links, props.sendClick, props.autoBlock)}>
       <span>{props.text}</span>
     </Localized>
   );
 }

--- a/browser/components/newtab/content-src/asrouter/components/SnippetBase/_SnippetBase.scss
+++ b/browser/components/newtab/content-src/asrouter/components/SnippetBase/_SnippetBase.scss
@@ -10,16 +10,20 @@
   border-top: 1px solid var(--newtab-snippets-hairline-color);
   box-shadow: $shadow-secondary;
   display: flex;
   align-items: center;
 
   a {
     cursor: pointer;
     color: var(--newtab-link-primary-color);
+
+    [lwt-newtab-brighttext] & {
+      font-weight: bold;
+    }
   }
 
   .innerWrapper {
     margin: 0 auto;
     display: flex;
     align-items: center;
     padding: 12px $section-horizontal-padding;
 

--- a/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
+++ b/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
@@ -22,16 +22,17 @@ Please note that some targeting attribut
 * [profileAgeReset](#profileagereset)
 * [providerCohorts](#providercohorts)
 * [region](#region)
 * [searchEngines](#searchengines)
 * [sync](#sync)
 * [topFrecentSites](#topfrecentsites)
 * [totalBookmarksCount](#totalbookmarkscount)
 * [xpinstallEnabled](#xpinstallEnabled)
+* [needsUpdate](#needsupdate)
 
 ## Detailed usage
 
 ### `addonsInfo`
 Provides information about the add-ons the user has installed.
 
 Note that the `name`, `userDisabled`, and `installDate` is only available if `isFullData` is `true` (this is usually not the case right at start-up).
 
@@ -379,8 +380,16 @@ declare const totalBookmarksCount: numbe
 
 Pref used by system administrators to disallow add-ons from installed altogether.
 
 #### Definition
 
 ```ts
 declare const xpinstallEnabled: boolean;
 ```
+
+### `needsUpdate`
+
+Does the client have the latest available version installed
+
+```ts
+declare const needsUpdate: boolean;
+```

--- a/browser/components/newtab/content-src/asrouter/rich-text-strings.js
+++ b/browser/components/newtab/content-src/asrouter/rich-text-strings.js
@@ -3,16 +3,17 @@ import {MessageContext} from "fluent";
 /**
  * Properties that allow rich text MUST be added to this list.
  *   key: the localization_id that should be used
  *   value: a property or array of properties on the message.content object
  */
 const RICH_TEXT_CONFIG = {
   "text": ["text", "scene1_text"],
   "privacy_html": "scene2_privacy_html",
+  "disclaimer_html": "scene2_disclaimer_html",
 };
 
 export const RICH_TEXT_KEYS = Object.keys(RICH_TEXT_CONFIG);
 
 /**
  * Generates an array of messages suitable for fluent's localization provider
  * including all needed strings for rich text.
  * @param {object} content A .content object from an ASR message (i.e. message.content)

--- a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss
+++ b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss
@@ -95,65 +95,65 @@
       color: $grey-90;
       margin-bottom: 8px;
       font-weight: 400;
     }
 
     > span > p {
       color: $grey-60;
       margin-top: 0;
-      height: 130px;
+      height: 180px;
       margin-bottom: 12px;
       font-size: 15px;
       line-height: 22px;
 
       @media(max-width: 650px) {
         margin-bottom: 0;
+        height: 160px;
       }
     }
   }
 
   .onboardingButton {
     background-color: $grey-90-10;
     border: 0;
     width: 150px;
     height: 30px;
     margin-bottom: 23px;
     padding: 4px 0 6px;
     font-size: 15px;
 
     // at 850px, the button shimmies down and to the right
     @media(max-width: 850px) {
       float: right;
-      margin-top: -60px;
-      margin-right: -10px;
+      margin-top: -105px;
+      margin-inline-end: -10px;
     }
 
     @media(max-width: 650px) {
       float: none;
-      margin-top: 30px;
     }
 
     &:focus,
     &.active,
     &:hover {
       box-shadow: 0 0 0 5px $grey-30;
       transition: box-shadow 150ms;
     }
   }
 
 
   &::before {
     content: '';
-    height: 220px;
+    height: 230px;
     width: 1px;
     position: absolute;
     background-color: $grey-30;
     margin-top: 40px;
-    margin-left: 215px;
+    margin-inline-start: 215px;
 
     // at 850px, the line goes from vertical to horizontal
     @media(max-width: 850px) {
       content: none;
     }
   }
 
   &:last-child::before {

new file mode 100644
--- /dev/null
+++ b/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.jsx
@@ -0,0 +1,37 @@
+import {isEmailOrPhoneNumber} from "./isEmailOrPhoneNumber";
+import React from "react";
+import {SubmitFormSnippet} from "../SubmitFormSnippet/SubmitFormSnippet.jsx";
+
+function validateInput(value, content) {
+  const type = isEmailOrPhoneNumber(value, content);
+  return type ? "" : "Must be an email or a phone number.";
+}
+
+function processFormData(input, message) {
+  const {content} = message;
+  const type = content.include_sms ? isEmailOrPhoneNumber(input.value, content) : "email";
+  const formData = new FormData();
+  let url;
+  if (type === "phone") {
+    url = "https://basket.mozilla.org/news/subscribe_sms/";
+    formData.append("mobile_number", input.value);
+    formData.append("msg_name", content.message_id_sms);
+    formData.append("country", content.country);
+  } else if (type === "email") {
+    url = "https://basket.mozilla.org/news/subscribe/";
+    formData.append("email", input.value);
+    formData.append("newsletters", content.message_id_email);
+    formData.append("source_url", encodeURIComponent(`https://snippets.mozilla.com/show/${message.id}`));
+  }
+  formData.append("lang", content.locale);
+  return {formData, url};
+}
+
+export const SendToDeviceSnippet = props => (
+  <SubmitFormSnippet {...props}
+    form_method="POST"
+    className="send_to_device_snippet"
+    inputType={props.content.include_sms ? "text" : "email"}
+    validateInput={props.content.include_sms ? validateInput : null}
+    processFormData={processFormData} />
+);

new file mode 100644
--- /dev/null
+++ b/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/isEmailOrPhoneNumber.js
@@ -0,0 +1,34 @@
+/**
+ * Checks if a given string is an email or phone number or neither
+ * @param {string} val The user input
+ * @param {ASRMessageContent} content .content property on ASR message
+ * @returns {"email"|"phone"|""} The type of the input
+ */
+export function isEmailOrPhoneNumber(val, content) {
+  const {locale} = content;
+  // http://emailregex.com/
+  const email_re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  const check_email = email_re.test(val);
+  let check_phone; // depends on locale
+  switch (locale) {
+    case "en-US":
+    case "en-CA":
+      // allow 10-11 digits in case user wants to enter country code
+      check_phone = val.length >= 10 && val.length <= 11 && !isNaN(val);
+      break;
+    case "de":
+      // allow between 2 and 12 digits for german phone numbers
+      check_phone = val.length >= 2 && val.length <= 12 && !isNaN(val);
+      break;
+    // this case should never be hit, but good to have a fallback just in case
+    default:
+      check_phone = !isNaN(val);
+      break;
+  }
+  if (check_email) {
+    return "email";
+  } else if (check_phone) {
+    return "phone";
+  }
+  return "";
+}

--- a/browser/components/newtab/content-src/asrouter/templates/SimpleSnippet/SimpleSnippet.jsx
+++ b/browser/components/newtab/content-src/asrouter/templates/SimpleSnippet/SimpleSnippet.jsx
@@ -11,19 +11,22 @@ export class SimpleSnippet extends React
     super(props);
     this.onButtonClick = this.onButtonClick.bind(this);
   }
 
   onButtonClick() {
     if (this.props.provider !== "preview") {
       this.props.sendUserActionTelemetry({event: "CLICK_BUTTON", id: this.props.UISurface});
     }
+    const {button_url} = this.props.content;
+    // If button_url is defined handle it as OPEN_URL action
+    const type = this.props.content.button_action || (button_url && "OPEN_URL");
     this.props.onAction({
-      type: this.props.content.button_action,
-      data: {args: this.props.content.button_action_args},
+      type,
+      data: {args: this.props.content.button_action_args || button_url},
     });
     if (!this.props.content.do_not_autoblock) {
       this.props.onBlock();
     }
   }
 
   renderTitle() {
     const {title} = this.props.content;
@@ -32,17 +35,17 @@ export class SimpleSnippet extends React
 
   renderTitleIcon() {
     const titleIcon = safeURI(this.props.content.title_icon);
     return titleIcon ? <span className="titleIcon" style={{backgroundImage: `url("${titleIcon}")`}} /> : null;
   }
 
   renderButton() {
     const {props} = this;
-    if (!props.content.button_action && !props.onButtonClick) {
+    if (!props.content.button_action && !props.onButtonClick && !props.content.button_url) {
       return null;
     }
 
     return (<Button
       onClick={props.onButtonClick || this.onButtonClick}
       color={props.content.button_color}
       backgroundColor={props.content.button_background_color}>
       {props.content.button_label}

--- a/browser/components/newtab/content-src/asrouter/templates/SimpleSnippet/SimpleSnippet.schema.json
+++ b/browser/components/newtab/content-src/asrouter/templates/SimpleSnippet/SimpleSnippet.schema.json
@@ -38,16 +38,22 @@
     "title_icon": {
       "type": "string",
       "description": "Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."
     },
     "button_action": {
       "type": "string",
       "description": "The type of action the button should trigger."
     },
+    "button_url": {
+      "allOf": [
+        {"$ref": "#/definitions/link_url"},
+        {"description": "A url, button_label links to this"}
+      ]
+    },
     "button_action_args": {
       "type": "string",
       "description": "Additional parameters for button action, example which specific menu the button should open"
     },
     "button_label": {
       "allOf": [
         {"$ref": "#/definitions/plainText"},
         {"description": "Text for a button next to main snippet text that links to button_url. Requires button_url."}
@@ -90,13 +96,14 @@
           "description": "Additional parameters for link action, example which specific menu the button should open"
         }
       }
     }
   },
   "additionalProperties": false,
   "required": ["text"],
   "dependencies": {
-    "button_label": ["button_action"],
+    "button_action": ["button_label"],
+    "button_url": ["button_label"],
     "button_color": ["button_label"],
     "button_background_color": ["button_label"]
   }
 }

--- a/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx
+++ b/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx
@@ -1,18 +1,20 @@
+import {Button} from "../../components/Button/Button";
 import React from "react";
 import {RichText} from "../../components/RichText/RichText";
 import {SimpleSnippet} from "../SimpleSnippet/SimpleSnippet";
 import {SnippetBase} from "../../components/SnippetBase/SnippetBase";
 
 export class SubmitFormSnippet extends React.PureComponent {
   constructor(props) {
     super(props);
     this.expandSnippet = this.expandSnippet.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
+    this.onInputChange = this.onInputChange.bind(this);
     this.state = {
       expanded: false,
       signupSubmitted: false,
       signupSuccess: false,
       disableForm: false,
     };
   }
 
@@ -27,33 +29,34 @@ export class SubmitFormSnippet extends R
     this.setState({disableForm: true});
     this.props.sendUserActionTelemetry({event: "CLICK_BUTTON", value: "conversion-subscribe-activation", id: "NEWTAB_FOOTER_BAR_CONTENT"});
 
     if (this.props.form_method.toUpperCase() === "GET") {
       this.refs.form.submit();
       return;
     }
 
-    const fetchConfig = {
-      body: new FormData(this.refs.form),
-      method: "POST",
-    };
+    const {url, formData} = this.props.processFormData ?
+      this.props.processFormData(this.refs.mainInput, this.props) :
+      {url: this.refs.form.action, formData: new FormData(this.refs.form)};
 
     try {
-      const fetchRequest = new Request(this.refs.form.action, fetchConfig);
+      const fetchRequest = new Request(url, {body: formData, method: "POST"});
       const response = await fetch(fetchRequest);
       json = await response.json();
     } catch (err) {
       console.log(err); // eslint-disable-line no-console
     }
+
     if (json && json.status === "ok") {
       this.setState({signupSuccess: true, signupSubmitted: true});
       this.props.onBlock({preventDismiss: true});
       this.props.sendUserActionTelemetry({event: "CLICK_BUTTON", value: "subscribe-success", id: "NEWTAB_FOOTER_BAR_CONTENT"});
     } else {
+      console.error("There was a problem submitting the form", json || "[No JSON response]"); // eslint-disable-line no-console
       this.setState({signupSuccess: false, signupSubmitted: true});
       this.props.sendUserActionTelemetry({event: "CLICK_BUTTON", value: "subscribe-error", id: "NEWTAB_FOOTER_BAR_CONTENT"});
     }
 
     this.setState({disableForm: false});
   }
 
   expandSnippet() {
@@ -69,57 +72,96 @@ export class SubmitFormSnippet extends R
 
     if (!hidden_inputs) {
       return null;
     }
 
     return Object.keys(hidden_inputs).map((key, idx) => <input key={idx} type="hidden" name={key} value={hidden_inputs[key]} />);
   }
 
+  renderDisclaimer() {
+    const {content} = this.props;
+    if (!content.scene2_disclaimer_html) {
+      return null;
+    }
+    return (<p className="disclaimerText">
+      <RichText text={content.scene2_disclaimer_html}
+        localization_id="disclaimer_html"
+        links={content.links}
+        autoBlock={false}
+        sendClick={this.props.sendClick} />
+    </p>);
+  }
+
   renderFormPrivacyNotice() {
     const {content} = this.props;
     if (!content.scene2_privacy_html) {
       return null;
     }
-    return (<label className="privacy-notice" htmlFor="id_privacy">
+    return (<label className="privacyNotice" htmlFor="id_privacy">
         <p>
           <input type="checkbox" id="id_privacy" name="privacy" required="required" />
           <span><RichText text={content.scene2_privacy_html}
             localization_id="privacy_html"
             links={content.links}
+            autoBlock={false}
             sendClick={this.props.sendClick} />
           </span>
         </p>
       </label>);
   }
 
   renderSignupSubmitted() {
-    const message = this.state.signupSuccess ? this.props.content.success_text : this.props.content.error_text;
-    const onButtonClick = !this.state.signupSuccess ? this.expandSnippet : null;
+    const {content} = this.props;
+    const isSuccess = this.state.signupSuccess;
+    const successTitle = isSuccess && content.success_title;
+    const bodyText = isSuccess ? content.success_text : content.error_text;
+    const retryButtonText = content.scene1_button_label;
+    return (<SnippetBase {...this.props}><div className="submissionStatus">
+      {successTitle ? <h2 className="submitStatusTitle">{successTitle}</h2> : null}
+      <p>{bodyText}{isSuccess ? null : <Button onClick={this.expandSnippet}>{retryButtonText}</Button>}</p>
+    </div></SnippetBase>);
+  }
 
-    return (<SimpleSnippet className={this.props.className}
-      onButtonClick={onButtonClick}
-      provider={this.props.provider}
-      content={{button_label: this.props.content.scene1_button_label, text: message}} />);
+  onInputChange(event) {
+    if (!this.props.validateInput) {
+      return;
+    }
+    const hasError = this.props.validateInput(event.target.value, this.props.content);
+    event.target.setCustomValidity(hasError);
+  }
+
+  renderInput() {
+    const placholder = this.props.content.scene2_email_placeholder_text || this.props.content.scene2_input_placeholder;
+    return (<input
+      ref="mainInput"
+      type={this.props.inputType || "email"}
+      className="mainInput"
+      name="email"
+      required={true}
+      placeholder={placholder}
+      onChange={this.props.validateInput ? this.onInputChange : null}
+      autoFocus={true} />);
   }
 
   renderSignupView() {
     const {content} = this.props;
-
-    return (<SnippetBase {...this.props} className="SubmitFormSnippet" footerDismiss={true}>
+    const containerClass = `SubmitFormSnippet ${this.props.className}`;
+    return (<SnippetBase {...this.props} className={containerClass} footerDismiss={true}>
+        {content.scene2_icon ? <div className="scene2Icon"><img src={content.scene2_icon} /></div> : null}
         <div className="message">
           <p>{content.scene2_text}</p>
         </div>
         <form action={content.form_action} method={this.props.form_method} onSubmit={this.handleSubmit} ref="form">
           {this.renderHiddenFormInputs()}
           <div>
-            <input type="email" name="email" required="required" placeholder={content.scene2_email_placeholder_text} autoFocus={true} />
+            {this.renderInput()}
             <button type="submit" className="ASRouterButton primary" ref="formSubmitBtn">{content.scene2_button_label}</button>
           </div>
-          {this.renderFormPrivacyNotice()}
+          {this.renderFormPrivacyNotice() || this.renderDisclaimer()}
         </form>
       </SnippetBase>);
   }
 
   getFirstSceneContent() {
     return Object.keys(this.props.content).filter(key => key.includes("scene1")).reduce((acc, key) => {
       acc[key.substr(7)] = this.props.content[key];
       return acc;

--- a/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json
+++ b/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json
@@ -14,28 +14,42 @@
     },
     "link_url": {
       "description": "Target for links or buttons",
       "type": "string",
       "format": "uri"
     }
   },
   "properties": {
+    "locale": {
+      "type": "string",
+      "description": "Two to five character string for the locale code"
+    },
+    "country": {
+      "type": "string",
+      "description": "Two character string for the country code (used for SMS)"
+    },
     "scene1_title": {
       "allof": [
-        {"$ref": "#/definitions/plaintext"},
+        {"$ref": "#/definitions/plainText"},
         {"description": "snippet title displayed before snippet text"}
       ]
     },
     "scene1_text": {
       "allOf": [
         {"$ref": "#/definitions/richText"},
         {"description": "Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}
       ]
     },
+    "scene2_title": {
+      "allOf": [
+        {"$ref": "#/definitions/plainText"},
+        {"description": "Title displayed before text in scene 2. Should be plain text."}
+      ]
+    },
     "scene2_text": {
       "allOf": [
         {"$ref": "#/definitions/richText"},
         {"description": "Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}
       ]
     },
     "scene1_icon": {
       "type": "string",
@@ -44,62 +58,90 @@
     "scene1_title_icon": {
       "type": "string",
       "description": "Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."
     },
     "form_action": {
       "type": "string",
       "description": "Endpoint to submit form data."
     },
+    "success_title": {
+      "type": "string",
+      "description": "(send to device) Title shown before text on successful registration."
+    },
     "success_text": {
       "type": "string",
       "description": "Message shown on successful registration."
     },
     "error_text": {
       "type": "string",
       "description": "Message shown if registration failed."
     },
     "scene2_email_placeholder_text": {
       "type": "string",
       "description": "Value to show while input is empty."
     },
+    "scene2_input_placeholder": {
+      "type": "string",
+      "description": "(send to device) Value to show while input is empty."
+    },
     "scene2_button_label": {
       "type": "string",
       "description": "Label for form submit button"
     },
     "scene2_privacy_html": {
       "type": "string",
       "description": "Information about how the form data is used."
     },
+    "scene2_disclaimer_html": {
+      "type": "string",
+      "description": "(send to device) Html for disclaimer and link underneath input box."
+    },
     "scene2_dismiss_button_text": {
       "type": "string",
       "description": "Label for the dismiss button when the sign-up form is expanded."
     },
+    "scene2_icon": {
+      "type": "string",
+      "description": "(send to device) Image to display above the form. 98x98px. SVG or PNG preferred."
+    },
     "hidden_inputs": {
       "type": "object",
       "description": "Each entry represents a hidden input, key is used as value for the name property."
     },
     "scene1_button_label": {
       "allOf": [
         {"$ref": "#/definitions/plainText"},
         {"description": "Text for a button next to main snippet text that links to button_url. Requires button_url."}
       ]
     },
-    "button_color": {
+    "scene1_button_color": {
       "type": "string",
       "description": "The text color of the button. Valid CSS color."
     },
-    "button_background_color": {
+    "scene1_button_background_color": {
       "type": "string",
       "description": "The background color of the button. Valid CSS color."
     },
     "do_not_autoblock": {
       "type": "boolean",
       "description": "Used to prevent blocking the snippet after the CTA (link or button) has been clicked"
     },
+    "include_sms": {
+      "type": "boolean",
+      "description": "(send to device) Allow users to send an SMS message with the form?"
+    },
+    "message_id_sms": {
+      "type": "string",
+      "description": "(send to device) Newsletter/basket id representing the SMS message to be sent."
+    },
+    "message_id_email": {
+      "type": "string",
+      "description": "(send to device) Newsletter/basket id representing the email message to be sent. Must be a value from the 'Slug' column here: https://basket.mozilla.org/news/."
+    },
     "links": {
       "additionalProperties": {
         "url": {
           "allOf": [
             {"$ref": "#/definitions/link_url"},
             {"description": "The url where the link points to."}
           ]
         },

--- a/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/_SubmitFormSnippet.scss
+++ b/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/_SubmitFormSnippet.scss
@@ -1,66 +1,103 @@
 .SubmitFormSnippet {
   flex-direction: column;
   flex: 1 1 100%;
   width: 100%;
 
+  &.send_to_device_snippet {
+    text-align: center;
+
+    .message {
+      font-size: 16px;
+    }
+  }
+
   .ASRouterButton {
     &.primary {
-      font-size: 15px;
       flex: 1 1 0;
     }
   }
 
+  .scene2Icon {
+    width: 100%;
+
+    img {
+      width: 98px;
+      display: inline-block;
+    }
+  }
+
   form {
     display: flex;
     flex-direction: column;
     width: 100%;
   }
 
   .message {
     font-size: 14px;
     align-self: stretch;
     flex: 0 0 100%;
+
+    p {
+      margin-top: 0;
+    }
   }
 
-  .privacy-notice {
+  .privacyNotice {
     color: var(--newtab-text-secondary-color);
     flex: 0 0 100%;
+
+    p {
+      margin-bottom: 0;
+    }
   }
 
   .innerWrapper {
     max-width: 670px;
     flex-wrap: wrap;
     justify-items: center;
+    padding-top: 40px;
+    padding-bottom: 40px;
   }
 
   .footer {
     width: 100%;
     margin: 0 auto;
     text-align: right;
-    background: $grey-20;
+    background-color: var(--newtab-background-color);
     padding: 10px 0;
 
     .footer-content {
       margin: 0 auto;
       max-width: 768px;
       width: 100%;
       text-align: right;
     }
   }
 
   input {
-    &[type='email'] {
+    &.mainInput {
+      border-radius: 3px;
       background-color: var(--newtab-textbox-background-color);
       border: $input-border;
       padding: 0 8px;
-      height: 32px;
+      height: 100%;
       font-size: 15px;
       width: 50%;
 
       &:focus {
         border: $input-border-active;
         box-shadow: var(--newtab-textbox-focus-boxshadow);
       }
     }
   }
 }
+
+.submissionStatus {
+  text-align: center;
+  font-size: 14px;
+  padding: 20px 0;
+
+  .submitStatusTitle {
+    font-size: 20px;
+  }
+}

--- a/browser/components/newtab/content-src/components/Card/Card.jsx
+++ b/browser/components/newtab/content-src/components/Card/Card.jsx
@@ -1,12 +1,12 @@
 import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm";
+import {FormattedMessage, injectIntl} from "react-intl";
 import {cardContextTypes} from "./types";
 import {connect} from "react-redux";
-import {FormattedMessage} from "react-intl";
 import {GetPlatformString} from "content-src/lib/link-menu-options";
 import {LinkMenu} from "content-src/components/LinkMenu/LinkMenu";
 import React from "react";
 import {ScreenshotUtils} from "content-src/lib/screenshot-utils";
 
 // Keep track of pending image loads to only request once
 const gImageLoading = new Map();
 
@@ -240,17 +240,17 @@ export class _Card extends React.PureCom
               {icon && !link.context && <span className={`card-context-icon icon icon-${icon}`} />}
               {link.icon && link.context && <span className="card-context-icon icon" style={{backgroundImage: `url('${link.icon}')`}} />}
               {intlID && !link.context && <div className="card-context-label"><FormattedMessage id={intlID} defaultMessage="Visited" /></div>}
               {link.context && <div className="card-context-label">{link.context}</div>}
             </div>
           </div>
         </div>
       </a>
-      {!props.placeholder && <button className="context-menu-button icon"
+      {!props.placeholder && <button className="context-menu-button icon" title={this.props.intl.formatMessage({id: "context_menu_title"})}
         onClick={this.onMenuButtonClick}>
         <span className="sr-only">{`Open context menu for ${link.title}`}</span>
       </button>}
       {isContextMenuOpen &&
         <LinkMenu
           dispatch={dispatch}
           index={index}
           source={eventSource}
@@ -259,10 +259,10 @@ export class _Card extends React.PureCom
           site={link}
           siteInfo={this._getTelemetryInfo()}
           shouldSendImpressionStats={shouldSendImpressionStats} />
       }
    </li>);
   }
 }
 _Card.defaultProps = {link: {}};
-export const Card = connect(state => ({platform: state.Prefs.values.platform}))(_Card);
+export const Card = connect(state => ({platform: state.Prefs.values.platform}))(injectIntl(_Card));
 export const PlaceholderCard = props => <Card placeholder={true} className={props.className} />;

--- a/browser/components/newtab/content-src/components/CollapsibleSection/CollapsibleSection.jsx
+++ b/browser/components/newtab/content-src/components/CollapsibleSection/CollapsibleSection.jsx
@@ -157,16 +157,17 @@ export class _CollapsibleSection extends
                   </span>
                 }
               </span>
             </span>
           </h3>
           <div>
             <button
               className="context-menu-button icon"
+              title={this.props.intl.formatMessage({id: "context_menu_title"})}
               onClick={this.onMenuButtonClick}
               onMouseEnter={this.onMenuButtonMouseEnter}
               onMouseLeave={this.onMenuButtonMouseLeave}>
               <span className="sr-only">
                 <FormattedMessage id="section_context_menu_button_sr" />
               </span>
             </button>
             {showContextMenu &&

--- a/browser/components/newtab/content-src/components/ConfirmDialog/_ConfirmDialog.scss
+++ b/browser/components/newtab/content-src/components/ConfirmDialog/_ConfirmDialog.scss
@@ -1,14 +1,15 @@
 .confirmation-dialog {
   .modal {
     box-shadow: 0 2px 2px 0 $black-10;
-    left: 50%;
-    margin-left: -200px;
+    left: 0;
+    margin: auto;
     position: fixed;
+    right: 0;
     top: 20%;
     width: 400px;
   }
 
   section {
     margin: 0;
   }
 

--- a/browser/components/newtab/content-src/components/TopSites/TopSite.jsx
+++ b/browser/components/newtab/content-src/components/TopSites/TopSite.jsx
@@ -274,17 +274,17 @@ export class TopSite extends React.PureC
 
   render() {
     const {props} = this;
     const {link} = props;
     const isContextMenuOpen = this.state.showContextMenu && props.activeIndex === props.index;
     const title = link.label || link.hostname;
     return (<TopSiteLink {...props} onClick={this.onLinkClick} onDragEvent={this.props.onDragEvent} className={`${props.className || ""}${isContextMenuOpen ? " active" : ""}`} title={title}>
         <div>
-          <button className="context-menu-button icon" onClick={this.onMenuButtonClick}>
+          <button className="context-menu-button icon" title={this.props.intl.formatMessage({id: "context_menu_title"})} onClick={this.onMenuButtonClick}>
             <span className="sr-only">
               <FormattedMessage id="context_menu_button_sr" values={{title}} />
             </span>
           </button>
           {isContextMenuOpen &&
             <LinkMenu
               dispatch={props.dispatch}
               index={props.index}